diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 21:54:37 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 21:54:37 +0000 |
| commit | fc3b67817d0b761d42f967852aa7275fd4ad8603 (patch) | |
| tree | 1f3c1a0384ab358c3856832b5a442cac5ba17df4 /base/logging.cc | |
| parent | 65bb3c450174df05cf2d74f649fe779d4fdf05ff (diff) | |
| download | chromium_src-fc3b67817d0b761d42f967852aa7275fd4ad8603.zip chromium_src-fc3b67817d0b761d42f967852aa7275fd4ad8603.tar.gz chromium_src-fc3b67817d0b761d42f967852aa7275fd4ad8603.tar.bz2 | |
Do not abort the process if thread owning the log mutex has crashed.
It makes UI tests even more flaky. However, we still log that event.
TEST=none
http://crbug.com/18028
Review URL: http://codereview.chromium.org/159723
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.cc')
| -rw-r--r-- | base/logging.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/base/logging.cc b/base/logging.cc index b5af671..27f2724 100644 --- a/base/logging.cc +++ b/base/logging.cc @@ -485,7 +485,12 @@ LogMessage::~LogMessage() { #if defined(OS_WIN) DWORD r = ::WaitForSingleObject(log_mutex, INFINITE); - DCHECK(r != WAIT_ABANDONED); + 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."; + } #elif defined(OS_POSIX) pthread_mutex_lock(&log_mutex); #endif |