content: Add heartbeat trace for CategorizedWorkerPool.

base/synchronization/condition_variable_win.cc

 // Copyright (c) 2011 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/synchronization/condition_variable.h"
 
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 
 namespace base {
 
 ConditionVariable::ConditionVariable(Lock* user_lock)
     : srwlock_(user_lock->lock_.native_handle())
 #if DCHECK_IS_ON()
     , user_lock_(user_lock)
 #endif
 {
   DCHECK(user_lock);
   InitializeConditionVariable(&cv_);
 }
 
 ConditionVariable::~ConditionVariable() = default;
 
 void ConditionVariable::Wait() {
   TimedWait(TimeDelta::FromMilliseconds(INFINITE));
 }
 
-void ConditionVariable::TimedWait(const TimeDelta& max_time) {
+bool ConditionVariable::TimedWait(const TimeDelta& max_time) {
   base::ThreadRestrictions::AssertWaitAllowed();
+  bool timed_out = false;

[robliao, 2016/06/07 15:40:30]

Minimal scope: Move to right before the if check below.

   DWORD timeout = static_cast<DWORD>(max_time.InMilliseconds());
 
 #if DCHECK_IS_ON()
   user_lock_->CheckHeldAndUnmark();
 #endif
 
   if (FALSE == SleepConditionVariableSRW(&cv_, srwlock_, timeout, 0)) {
-    DCHECK(GetLastError() != WAIT_TIMEOUT);
+    timed_out = GetLastError() == WAIT_TIMEOUT;

[robliao, 2016/06/07 15:40:30]

Looks like your changelist uncovered a longstanding bug here. The comparison
should be GetLastError() == ERROR_TIMEOUT.

[prashant.n, 2016/06/07 15:49:54]

I just copied earlier code, I'll make chnages suggested by you.

+    DCHECK(max_time != TimeDelta::FromMilliseconds(INFINITE) || !timed_out);

[robliao, 2016/06/07 15:40:30]

This DCHECK will pass all cases where max_time is not set to infinite, missing
real failures where max_time is not INFINITE.

There's not a real need to check that we receive a timeout with INFINITE as its
specified by the Windows platform that INFINITE waits will not timeout.

As a result, the original DCHECK can still stand, and equivalently here
DCHECK(timed_out).

[prashant.n, 2016/06/07 15:49:54]

I'll correct this. May be I'll add two explicit dchecks with error messages.

   }
 
 #if DCHECK_IS_ON()
   user_lock_->CheckUnheldAndMark();
 #endif
+
+  return timed_out;
 }
 
 void ConditionVariable::Broadcast() {
   WakeAllConditionVariable(&cv_);
 }
 
 void ConditionVariable::Signal() {
   WakeConditionVariable(&cv_);
 }
 
 }  // namespace base