diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 03:05:06 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 03:05:06 +0000 |
| commit | 720f6e97bdc37bafd6520d9b854d3708f22c17b1 (patch) | |
| tree | ad9cb10639b560fb38e204cd27e486d4259b5617 | |
| parent | f3486f394298341b5cb20a3690cedad17409fbcc (diff) | |
| download | chromium_src-720f6e97bdc37bafd6520d9b854d3708f22c17b1.zip chromium_src-720f6e97bdc37bafd6520d9b854d3708f22c17b1.tar.gz chromium_src-720f6e97bdc37bafd6520d9b854d3708f22c17b1.tar.bz2 | |
ThreadWatcher - give ShutdownWatchDogThread::Alarm a more
unique function body.
Changed ShutdownWatchDogThread::Alarm's to call
ShutdownCrash(), so it does not get merged by the link time
optimization.
R=jar@chromium.org, eroman@chromium.org
BUG=232080
Review URL: https://codereview.chromium.org/14250003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194524 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/metrics/thread_watcher.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index f6e43f4..57531be 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -51,6 +51,10 @@ void NullPointerCrash(int line_number) { #endif } +NOINLINE void ShutdownCrash() { + NullPointerCrash(__LINE__); +} + NOINLINE void ThreadUnresponsive_UI() { NullPointerCrash(__LINE__); } @@ -873,7 +877,7 @@ class ShutdownWatchDogThread : public base::Watchdog { // Alarm is called if the time expires after an Arm() without someone calling // Disarm(). We crash the browser if this method is called. virtual void Alarm() OVERRIDE { - CHECK(false); + ShutdownCrash(); } DISALLOW_COPY_AND_ASSIGN(ShutdownWatchDogThread); |