diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 21:56:30 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 21:56:30 +0000 |
| commit | 23751182044f1119eb82782214bb7e79f4341ff8 (patch) | |
| tree | fe96a371e22595b4cbe66e42504dc611d99c5ded /base/tracked_objects.h | |
| parent | 6a876c6278da1f2bdb943153d0037ccf7d9659cd (diff) | |
| download | chromium_src-23751182044f1119eb82782214bb7e79f4341ff8.zip chromium_src-23751182044f1119eb82782214bb7e79f4341ff8.tar.gz chromium_src-23751182044f1119eb82782214bb7e79f4341ff8.tar.bz2 | |
Commneted out ShutdownSingleThreadedCleanup in debug builds to
suppress the TSan complaints. Enabled NonSearchToSearchDoesntSupportInstant
in intractive_ui_tests for Linux.
BUG=70810,61179
TEST=please test interactive_ui_tests.
Review URL: http://codereview.chromium.org/6546020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tracked_objects.h')
| -rw-r--r-- | base/tracked_objects.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/base/tracked_objects.h b/base/tracked_objects.h index ed629c3..ac49225 100644 --- a/base/tracked_objects.h +++ b/base/tracked_objects.h @@ -643,13 +643,10 @@ class AutoTracking { #ifndef NDEBUG if (state_ != kRunning) return; - // Don't call these in a Release build: they just waste time. - // The following should ONLY be called when in single threaded mode. It is - // unsafe to do this cleanup if other threads are still active. - // It is also very unnecessary, so I'm only doing this in debug to satisfy - // purify (if we need to!). - ThreadData::ShutdownSingleThreadedCleanup(); - state_ = kTornDownAndStopped; + // We don't do cleanup of any sort in Release build because it is a + // complete waste of time. Since Chromium doesn't join all its thread and + // guarantee we're in a single threaded mode, we don't even do cleanup in + // debug mode, as it will generate race-checker warnings. #endif } |