Rename some crash related methods and improve debugging.

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"
 #include "base/debug/alias.h"
+#include "base/debug/debugger.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 12 matching lines @@
 
 // The following are unique function names for forcing the crash when a thread
 // is unresponsive. This makes it possible to tell from the callstack alone what
 // thread was unresponsive.
 //
 // We disable optimizations for this block of functions so the compiler doesn't
 // merge them all together.
 MSVC_DISABLE_OPTIMIZE()
 MSVC_PUSH_DISABLE_WARNING(4748)
 
-#ifndef NDEBUG
-int* NullPointer() {
-  return reinterpret_cast<int*>(NULL);
-}
-#endif
-
-void NullPointerCrash(int line_number) {
-#ifndef NDEBUG
-  *NullPointer() = line_number;  // Crash.
+void ReportThreadHang() {
+#if defined(NDEBUG)
+  base::debug::DumpWithoutCrashing();
 #else
-  base::debug::DumpWithoutCrashing();
+  base::debug::BreakDebugger();
 #endif
 }
 
 #if !defined(OS_ANDROID) || !defined(NDEBUG)
 // TODO(rtenneti): Enabled crashing, after getting data.
-NOINLINE void StartupCrash() {
-  NullPointerCrash(__LINE__);
+NOINLINE void StartupHang() {
+  ReportThreadHang();
 }
 #endif  // OS_ANDROID
 
-NOINLINE void ShutdownCrash() {
-  NullPointerCrash(__LINE__);
+NOINLINE void ShutdownHang() {
+  ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_UI() {
-  NullPointerCrash(__LINE__);
+  ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_DB() {
-  NullPointerCrash(__LINE__);
+  ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_FILE() {
-  NullPointerCrash(__LINE__);
+  ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_FILE_USER_BLOCKING() {
-  NullPointerCrash(__LINE__);
+  ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_PROCESS_LAUNCHER() {
-  NullPointerCrash(__LINE__);
+  ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_CACHE() {
-  NullPointerCrash(__LINE__);
+  ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_IO() {
-  NullPointerCrash(__LINE__);
+  ReportThreadHang();
 }
 
 MSVC_POP_WARNING()
 MSVC_ENABLE_OPTIMIZE();
 
 void CrashBecauseThreadWasUnresponsive(BrowserThread::ID thread_id) {
   base::debug::Alias(&thread_id);
 
   switch (thread_id) {
     case BrowserThread::UI:
@@ skipping 821 matching lines @@
     start_time_thread_now_ = base::TimeTicks::IsThreadNowSupported()
         ? base::TimeTicks::ThreadNow() : base::TimeTicks::Now();
 #endif  // OS_ANDROID
   }
 
   // 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
   // without crashing and in debug mode we break into the debugger.
   virtual void Alarm() OVERRIDE {
 #if !defined(NDEBUG)
-    StartupCrash();
+    StartupHang();
     return;
 #elif !defined(OS_ANDROID)
-    WatchDogThread::PostTask(FROM_HERE, base::Bind(&StartupCrash));
+    WatchDogThread::PostTask(FROM_HERE, base::Bind(&StartupHang));
     return;
 #else  // Android release: gather stats to figure out when to crash.
     // TODO(rtenneti): Delete this code, after getting data.
     UMA_HISTOGRAM_TIMES("StartupTimeBomb.Alarm.TimeDuration",
                         base::Time::Now() - start_time_clock_);
     UMA_HISTOGRAM_TIMES("StartupTimeBomb.Alarm.TimeTicksDuration",
                         base::TimeTicks::Now() - start_time_monotonic_);
     if (base::TimeTicks::IsThreadNowSupported()) {
       UMA_HISTOGRAM_TIMES(
           "StartupTimeBomb.Alarm.ThreadNowDuration",
@@ skipping 21 matching lines @@
  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 {
-    ShutdownCrash();
+    ShutdownHang();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShutdownWatchDogThread);
 };
 }  // namespace
 
 // StartupTimeBomb methods and members.
 //
 // static
@@ skipping 88 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();
 }