Add lock owner information for class Monitor and add assertions for wait/notify/notifyall.

runtime/vm/os_thread_win.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"  // NOLINT
 #if defined(TARGET_OS_WINDOWS)
 
 #include "vm/growable_array.h"
 #include "vm/os_thread.h"
 
@@ skipping 180 matching lines @@
   }
 }
 
 
 Mutex::Mutex() {
   // Allocate unnamed semaphore with initial count 1 and max count 1.
   data_.semaphore_ = CreateSemaphore(NULL, 1, 1, NULL);
   if (data_.semaphore_ == NULL) {
     FATAL1("Mutex allocation failed %d", GetLastError());
   }
+#if defined(DEBUG)
   // When running with assertions enabled we do track the owner.
-#if defined(DEBUG)
   owner_ = OSThread::kInvalidThreadId;
 #endif  // defined(DEBUG)
 }
 
 
 Mutex::~Mutex() {
   CloseHandle(data_.semaphore_);
+#if defined(DEBUG)
   // When running with assertions enabled we do track the owner.
-#if defined(DEBUG)
   ASSERT(owner_ == OSThread::kInvalidThreadId);
 #endif  // defined(DEBUG)
 }
 
 
 void Mutex::Lock() {
   DWORD result = WaitForSingleObject(data_.semaphore_, INFINITE);
   if (result != WAIT_OBJECT_0) {
     FATAL1("Mutex lock failed %d", GetLastError());
   }
+#if defined(DEBUG)
   // When running with assertions enabled we do track the owner.
-#if defined(DEBUG)
   owner_ = OSThread::GetCurrentThreadId();
 #endif  // defined(DEBUG)
 }
 
 
 bool Mutex::TryLock() {
   // Attempt to pass the semaphore but return immediately.
   DWORD result = WaitForSingleObject(data_.semaphore_, 0);
   if (result == WAIT_OBJECT_0) {
+#if defined(DEBUG)
     // When running with assertions enabled we do track the owner.
-#if defined(DEBUG)
     owner_ = OSThread::GetCurrentThreadId();
 #endif  // defined(DEBUG)
     return true;
   }
   if (result == WAIT_ABANDONED || result == WAIT_FAILED) {
     FATAL1("Mutex try lock failed %d", GetLastError());
   }
   ASSERT(result == WAIT_TIMEOUT);
   return false;
 }
 
 
 void Mutex::Unlock() {
+#if defined(DEBUG)
   // When running with assertions enabled we do track the owner.
-#if defined(DEBUG)
   ASSERT(IsOwnedByCurrentThread());
   owner_ = OSThread::kInvalidThreadId;
 #endif  // defined(DEBUG)
   BOOL result = ReleaseSemaphore(data_.semaphore_, 1, NULL);
   if (result == 0) {
     FATAL1("Mutex unlock failed %d", GetLastError());
   }
 }
 
 
 ThreadLocalKey MonitorWaitData::monitor_wait_data_key_ =
     OSThread::kUnsetThreadLocalKey;
 
 
 Monitor::Monitor() {
   InitializeCriticalSection(&data_.cs_);
   InitializeCriticalSection(&data_.waiters_cs_);
   data_.waiters_head_ = NULL;
   data_.waiters_tail_ = NULL;
+
+#if defined(DEBUG)
+  // When running with assertions enabled we track the owner.
+  owner_ = OSThread::kInvalidThreadId;
+#endif  // defined(DEBUG)
 }
 
 
 Monitor::~Monitor() {
+#if defined(DEBUG)
+  // When running with assertions enabled we track the owner.
+  ASSERT(owner_ == OSThread::kInvalidThreadId);
+#endif  // defined(DEBUG)
+
   DeleteCriticalSection(&data_.cs_);
   DeleteCriticalSection(&data_.waiters_cs_);
 }
 
 
 void Monitor::Enter() {
   EnterCriticalSection(&data_.cs_);
+
+#if defined(DEBUG)
+  // When running with assertions enabled we track the owner.
+  ASSERT(owner_ == OSThread::kInvalidThreadId);
+  owner_ = OSThread::GetCurrentThreadId();
+#endif  // defined(DEBUG)
 }
 
 
 void Monitor::Exit() {
+#if defined(DEBUG)
+  // When running with assertions enabled we track the owner.
+  ASSERT(IsOwnedByCurrentThread());
+  owner_ = OSThread::kInvalidThreadId;
+#endif  // defined(DEBUG)
+
   LeaveCriticalSection(&data_.cs_);
 }
 
 
 void MonitorWaitData::ThreadExit() {
   if (MonitorWaitData::monitor_wait_data_key_ !=
       OSThread::kUnsetThreadLocalKey) {
     uword raw_wait_data =
       OSThread::GetThreadLocal(MonitorWaitData::monitor_wait_data_key_);
     // Clear in case this is called a second time.
@@ skipping 116 matching lines @@
                              reinterpret_cast<uword>(wait_data));
   } else {
     wait_data = reinterpret_cast<MonitorWaitData*>(raw_wait_data);
     wait_data->next_ = NULL;
   }
   return wait_data;
 }
 
 
 Monitor::WaitResult Monitor::Wait(int64_t millis) {
+#if defined(DEBUG)
+  // When running with assertions enabled we track the owner.
+  ASSERT(IsOwnedByCurrentThread());
+  ThreadId saved_owner = owner_;
+  owner_ = OSThread::kInvalidThreadId;
+#endif  // defined(DEBUG)
+
   Monitor::WaitResult retval = kNotified;
 
   // Get the wait data object containing the event to wait for.
   MonitorWaitData* wait_data = MonitorData::GetMonitorWaitDataForThread();
 
   // Start waiting by adding the MonitorWaitData to the list of
   // waiters.
   data_.AddWaiter(wait_data);
 
   // Leave the monitor critical section while waiting.
@@ skipping 17 matching lines @@
     if (result == WAIT_TIMEOUT) {
       // No longer waiting. Remove from the list of waiters.
       data_.RemoveWaiter(wait_data);
       retval = kTimedOut;
     }
   }
 
   // Reacquire the monitor critical section before continuing.
   EnterCriticalSection(&data_.cs_);
 
+#if defined(DEBUG)
+  // When running with assertions enabled we track the owner.
+  ASSERT(owner_ == OSThread::kInvalidThreadId);
+  owner_ = OSThread::GetCurrentThreadId();
+  ASSERT(owner_ == saved_owner);
+#endif  // defined(DEBUG)
   return retval;
 }
 
 
 Monitor::WaitResult Monitor::WaitMicros(int64_t micros) {
   // TODO(johnmccutchan): Investigate sub-millisecond sleep times on Windows.
   int64_t millis = micros / kMicrosecondsPerMillisecond;
   if ((millis * kMicrosecondsPerMillisecond) < micros) {
     // We've been asked to sleep for a fraction of a millisecond,
     // this isn't supported on Windows. Bumps milliseconds up by one
     // so that we never return too early. We likely return late though.
     millis += 1;
   }
   return Wait(millis);
 }
 
 
 void Monitor::Notify() {
+  // When running with assertions enabled we track the owner.
+  ASSERT(IsOwnedByCurrentThread());
   data_.SignalAndRemoveFirstWaiter();
 }
 
 
 void Monitor::NotifyAll() {
+  // When running with assertions enabled we track the owner.
+  ASSERT(IsOwnedByCurrentThread());
   // If one of the objects in the list of waiters wakes because of a
   // timeout before we signal it, that object will get an extra
   // signal. This will be treated as a spurious wake-up and is OK
   // since all uses of monitors should recheck the condition after a
   // Wait.
   data_.SignalAndRemoveAllWaiters();
 }
 
 
 void ThreadLocalData::AddThreadLocal(ThreadLocalKey key,
@@ skipping 148 matching lines @@
 #pragma data_seg(".CRT$XLB")
 PIMAGE_TLS_CALLBACK p_thread_callback_dart = OnDartThreadExit;
 
 // Reset the default section.
 #pragma data_seg()
 
 #endif  // _WIN64
 }  // extern "C"
 
 #endif  // defined(TARGET_OS_WINDOWS)