Watchdog - Added a JOINABLE state to avoid StartupTimebomb

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 834 matching lines @@
 void StartupTimeBomb::Arm(const base::TimeDelta& duration) {
   DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!startup_watchdog_);
   startup_watchdog_ = new StartupWatchDogThread(duration);
   startup_watchdog_->Arm();
 }
 
 void StartupTimeBomb::Disarm() {
   DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

[jar (doing other things), 2012/01/18 17:24:44]

FYI: This is an assertion that is failing on the try bot currently under the
guise of the sync test failing.  I can't see the call stack, and can only see
the CHECK.

[ramant (doing other things), 2012/01/18 20:45:30]

It was being run on Test thread. The DCHECK was wrong. We already check that it
is being Disarm'ed on the same thread as the thread on which it was
created/Armed.

Done.

   if (startup_watchdog_) {
     startup_watchdog_->Disarm();
+    startup_watchdog_->Cleanup();
+    DeleteStartupWatchdog();
+  }
+}
+
+void StartupTimeBomb::DeleteStartupWatchdog() {
+  DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (startup_watchdog_->IsJoinable()) {
     // Allow the watchdog thread to shutdown on UI. Watchdog thread shutdowns
     // very fast.
     base::ThreadRestrictions::SetIOAllowed(true);
     delete startup_watchdog_;
     startup_watchdog_ = NULL;
+    return;
   }
+  MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&StartupTimeBomb::DeleteStartupWatchdog,
+                 base::Unretained(this)),
+      base::TimeDelta::FromSeconds(10).InMilliseconds());
 }
 
 // static
 void StartupTimeBomb::DisarmStartupTimeBomb() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (g_startup_timebomb_)
     g_startup_timebomb_->Disarm();
 }
 
 // ShutdownWatcherHelper methods and members.
@@ skipping 29 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();
 }