ThreadWatcher - give ShutdownWatchDogThread::Alarm a more unique function body.

chrome/browser/metrics/thread_watcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/thread_watcher.h"
 
 #include <math.h>  // ceil
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 33 matching lines @@
 }
 
 void NullPointerCrash(int line_number) {
 #ifndef NDEBUG
   *NullPointer() = line_number;  // Crash.
 #else
   logging::DumpWithoutCrashing();
 #endif
 }
 
+NOINLINE void StartupCrash() {
+  NullPointerCrash(__LINE__);
+}
+
+NOINLINE void ShutdownCrash() {
+  NullPointerCrash(__LINE__);
+}
+
 NOINLINE void ThreadUnresponsive_UI() {
   NullPointerCrash(__LINE__);
 }
 
 NOINLINE void ThreadUnresponsive_DB() {
   NullPointerCrash(__LINE__);
 }
 
 NOINLINE void ThreadUnresponsive_WEBKIT() {
   NullPointerCrash(__LINE__);
@@ skipping 775 matching lines @@
 // Class for detecting hangs during startup.
 class StartupWatchDogThread : public base::Watchdog {
  public:
   // Constructor specifies how long the StartupWatchDogThread will wait before
   // alarming.
   explicit StartupWatchDogThread(const base::TimeDelta& duration)
       : base::Watchdog(duration, "Startup watchdog thread", true) {
   }
 
   // Alarm is called if the time expires after an Arm() without someone calling
   // Disarm(). When Alarm goes off, in release mode we get the crash dump

[eroman, 2013/04/16 22:53:12]

This comment no longer matches the code.

[ramant (doing other things), 2013/04/16 23:00:40]

Reverted this change. Shouldn't have changed the behavior.

   // without crashing and in debug mode we break into the debugger.
   virtual void Alarm() OVERRIDE {
-#ifndef NDEBUG
-    DCHECK(false);
-#else
-    logging::DumpWithoutCrashing();
-#endif
+    StartupCrash();

[eroman, 2013/04/16 22:53:12]

Is this behavior change intentional? before it would DumpWithoutCrashing()
whereas now it outright crashes.

[ramant (doing other things), 2013/04/16 23:00:40]

Reverted the change.

   }
 
   DISALLOW_COPY_AND_ASSIGN(StartupWatchDogThread);
 };
 
 // ShutdownWatchDogThread methods and members.
 //
 // Class for detecting hangs during shutdown.
 class ShutdownWatchDogThread : public base::Watchdog {
  public:
   // Constructor specifies how long the ShutdownWatchDogThread will wait before
   // alarming.
   explicit ShutdownWatchDogThread(const base::TimeDelta& duration)
       : base::Watchdog(duration, "Shutdown watchdog thread", true) {
   }
 
   // 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);
 };
 }  // namespace
 
 // StartupTimeBomb methods and members.
 //
 // static
 StartupTimeBomb* StartupTimeBomb::g_startup_timebomb_ = NULL;
@@ skipping 89 matching lines @@
 
 #if defined(OS_WIN)
   // On Windows XP, give twice the time for shutdown.
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     actual_duration *= 2;
 #endif
 
   shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
   shutdown_watchdog_->Arm();
 }