Skip to content

Clear thread_local_data_ before RegisterThreadCache in ThreadCache::BecomeIdle. #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Clear thread_local_data_ before RegisterThreadCache in ThreadCache::BecomeIdle. #671

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tcmalloc/thread_cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,8 @@ void ThreadCache::BecomeIdle() {
if (heap->in_setspecific_) return; // Do not disturb the active caller

heap->in_setspecific_ = true;
PerCpuState::state().RegisterThreadCache(nullptr);
// Also update the copy in __thread
thread_local_data_ = nullptr;
PerCpuState::state().RegisterThreadCache(nullptr);
heap->in_setspecific_ = false;
if (GetCacheIfPresent() == heap) {
// Somehow heap got reinstated by a recursive call to malloc
Expand Down
Loading