Increase fudge factor to let WatchdogTest.AlarmTest pass reliably on slower m...

base/watchdog.cc

 // Copyright (c) 2006-2008 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 "base/watchdog.h"
 
 #include "base/compiler_specific.h"
 #include "base/platform_thread.h"
 
 using base::TimeDelta;
@@ skipping 91 matching lines @@
           if (last_debugged_alarm_time_ > watchdog_->start_time_)
             // Too many alarms must have taken place.
             watchdog_->state_ = DISARMED;
           continue;
         }
       }
       watchdog_->state_ = DISARMED;  // Only alarm at most once.
       TimeTicks last_alarm_time = TimeTicks::Now();
       watchdog_->Alarm();  // Set a break point here to debug on alarms.
       TimeDelta last_alarm_delay = TimeTicks::Now() - last_alarm_time;
-      if (last_alarm_delay > TimeDelta::FromMilliseconds(2)) {
+      // Normally, a threshold of 2ms works here, but 10x higher
+      // threshold needed to reliably pass WatchdogTest.AlarmTest
+      // under valgrind on an old 3.4GHz Pentium 4.  Use 15x for margin.
+      if (last_alarm_delay > TimeDelta::FromMilliseconds(30)) {
         // Ignore race of two alarms/breaks going off at roughly the same time.
         AutoLock static_lock(static_lock_);
         // This was a real debugger break.
         last_debugged_alarm_time_ = last_alarm_time;
         last_debugged_alarm_delay_ = last_alarm_delay;
       }
     }
   }
 }
 
 void Watchdog::ThreadDelegate::SetThreadName() const {
   std::string name = watchdog_->thread_watched_name_ + " Watchdog";
   PlatformThread::SetName(name.c_str());
   DLOG(INFO) << "Watchdog active: " << name;
 }
 
 // static
 Lock Watchdog::static_lock_;  // Lock for access of static data...
 // static
 TimeTicks Watchdog::last_debugged_alarm_time_ = TimeTicks();
 // static
 TimeDelta Watchdog::last_debugged_alarm_delay_;