Disallow UI/IO thread blocking on any other thread.

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 <windows.h>
 #include <stack>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 
 namespace {
 // We can't use the linker supported delay-load for kernel32 so all this
 // cruft here is to manually late-bind the needed functions.
 typedef void (WINAPI *InitializeConditionVariableFn)(PCONDITION_VARIABLE);
 typedef BOOL (WINAPI *SleepConditionVariableCSFn)(PCONDITION_VARIABLE,
                                                   PCRITICAL_SECTION, DWORD);
 typedef void (WINAPI *WakeConditionVariableFn)(PCONDITION_VARIABLE);
 typedef void (WINAPI *WakeAllConditionVariableFn)(PCONDITION_VARIABLE);
@@ skipping 64 matching lines @@
     : user_lock_(*user_lock) {
   initialize_condition_variable_fn(&cv_);
   DCHECK(user_lock);
 }
 
 void WinVistaCondVar::Wait() {
   TimedWait(TimeDelta::FromMilliseconds(INFINITE));
 }
 
 void WinVistaCondVar::TimedWait(const TimeDelta& max_time) {
+  base::ThreadRestrictions::AssertWaitAllowed();
   DWORD timeout = static_cast<DWORD>(max_time.InMilliseconds());
   CRITICAL_SECTION* cs = user_lock_.lock_.os_lock();
 
 #if !defined(NDEBUG)
   user_lock_.CheckHeldAndUnmark();
 #endif
 
   if (FALSE == sleep_condition_variable_fn(&cv_, cs, timeout)) {
     DCHECK(GetLastError() != WAIT_TIMEOUT);
   }
@@ skipping 125 matching lines @@
 
   DCHECK_EQ(recycling_list_size_, allocation_counter_);
 }
 
 void WinXPCondVar::Wait() {
   // Default to "wait forever" timing, which means have to get a Signal()
   // or Broadcast() to come out of this wait state.
   TimedWait(TimeDelta::FromMilliseconds(INFINITE));
 }
 
 void WinXPCondVar::TimedWait(const TimeDelta& max_time) {

[brettw, 2012/04/25 05:41:14]

Do you also want to add the assert to the XP implementation? It doesn't matter
since most developers don't use XP, but it's probably good for completeness.

[jam, 2012/04/25 22:56:46]

Done.

   Event* waiting_event;
   HANDLE handle;
   {
     AutoLock auto_lock(internal_lock_);
     if (RUNNING != run_state_) return;  // Destruction in progress.
     waiting_event = GetEventForWaiting();
     handle = waiting_event->handle();
     DCHECK(handle);
   }  // Release internal_lock.
 
@@ skipping 404 matching lines @@
 
 void ConditionVariable::Broadcast() {
   impl_->Broadcast();
 }
 
 void ConditionVariable::Signal() {
   impl_->Signal();
 }
 
 }  // namespace base