simMutex

runtime/vm/os_thread_android.cc

Index: runtime/vm/os_thread_android.cc
===================================================================
--- runtime/vm/os_thread_android.cc	(revision 44732)
+++ runtime/vm/os_thread_android.cc	(working copy)
@@ -11,7 +11,6 @@
 #include <sys/time.h>  // NOLINT
 
 #include "platform/assert.h"
-#include "vm/isolate.h"
 
 namespace dart {
 
@@ -197,7 +196,7 @@
 
   // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  owner_ = NULL;
+  owner_ = OSThread::kInvalidThreadId;
 #endif  // defined(DEBUG)
 }
 
@@ -209,7 +208,7 @@
 
   // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  ASSERT(owner_ == NULL);
+  ASSERT(owner_ == OSThread::kInvalidThreadId);
 #endif  // defined(DEBUG)
 }
 
@@ -221,7 +220,7 @@
   ASSERT(result == 0);  // Verify no other errors.
   // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  owner_ = Isolate::Current();
+  owner_ = OSThread::GetCurrentThreadId();
 #endif  // defined(DEBUG)
 }
 
@@ -235,7 +234,7 @@
   ASSERT(result == 0);  // Verify no other errors.
   // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  owner_ = Isolate::Current();
+  owner_ = OSThread::GetCurrentThreadId();
 #endif  // defined(DEBUG)
   return true;
 }
@@ -244,8 +243,8 @@
 void Mutex::Unlock() {
   // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  ASSERT(owner_ == Isolate::Current());
-  owner_ = NULL;
+  ASSERT(IsOwnedByCurrentThread());
+  owner_ = OSThread::kInvalidThreadId;
 #endif  // defined(DEBUG)
   int result = pthread_mutex_unlock(data_.mutex());
   // Specifically check for wrong thread unlocking to aid debugging.