diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 15:25:18 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 15:25:18 +0000 |
| commit | 517d1ccd28095c20530c0f91491c69e87df0dfea (patch) | |
| tree | 2f949836fc4ac19b4f47db04a8cbac50e132a3b5 /base | |
| parent | 67f1288f16fac78a0d7f23699212c4528f356203 (diff) | |
| download | chromium_src-517d1ccd28095c20530c0f91491c69e87df0dfea.zip chromium_src-517d1ccd28095c20530c0f91491c69e87df0dfea.tar.gz chromium_src-517d1ccd28095c20530c0f91491c69e87df0dfea.tar.bz2 | |
Revert 107944 - Avoid all unnecessary calls to TLS during thread teardown
Mac base_unittests is still flaky....
Pthread is still sometimes crashing Mac on shutdown.
I'm suspicious that my handlers are tickling it.
This removes a DCHECK(), which checked status in
TLS during the teardown.
TBR=rtenneti
Review URL: http://codereview.chromium.org/8424013
TBR=jar@chromium.org
Review URL: http://codereview.chromium.org/8431003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/tracked_objects.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc index 05713b7..aba051ca 100644 --- a/base/tracked_objects.cc +++ b/base/tracked_objects.cc @@ -203,6 +203,7 @@ ThreadData* ThreadData::Get() { void ThreadData::OnThreadTermination(void* thread_data) { if (!kTrackAllTaskObjects) return; // Not compiled in. + DCHECK(tls_index_.initialized()); if (!thread_data) return; reinterpret_cast<ThreadData*>(thread_data)->OnThreadTerminationCleanup(); |