diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 18:35:53 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 18:35:53 +0000 |
| commit | c0e271526431ce0ea45f8a2fb47d19f6ca12858a (patch) | |
| tree | ac8431d85a7bbfd47d43d6d735db93b172c45937 /base | |
| parent | 7d1ba939f09dbca3ac8a968dd0e695bb788c90d9 (diff) | |
| download | chromium_src-c0e271526431ce0ea45f8a2fb47d19f6ca12858a.zip chromium_src-c0e271526431ce0ea45f8a2fb47d19f6ca12858a.tar.gz chromium_src-c0e271526431ce0ea45f8a2fb47d19f6ca12858a.tar.bz2 | |
Remove even the logging statement from ~LogMessage. We shouldn't be using LOG macros there.
TEST=none
http://crbug.com/18028
Review URL: http://codereview.chromium.org/159789
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/logging.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/base/logging.cc b/base/logging.cc index 27f2724..d35cfdb 100644 --- a/base/logging.cc +++ b/base/logging.cc @@ -484,13 +484,12 @@ LogMessage::~LogMessage() { InitLogMutex(); #if defined(OS_WIN) - DWORD r = ::WaitForSingleObject(log_mutex, INFINITE); - if (r == WAIT_ABANDONED) { - // Do not abort the process here. UI tests might be crashy sometimes, - // and aborting the test binary only makes the problem worse. - // For more info see http://crbug.com/18028. - LOG(ERROR) << "Thread owning the log mutex has crashed."; - } + ::WaitForSingleObject(log_mutex, INFINITE); + // WaitForSingleObject could have returned WAIT_ABANDONED. We don't + // abort the process here. UI tests might be crashy sometimes, + // and aborting the test binary only makes the problem worse. + // We also don't use LOG macros because that might lead to an infinite + // loop. For more info see http://crbug.com/18028. #elif defined(OS_POSIX) pthread_mutex_lock(&log_mutex); #endif |