Bug 1290589 - Make JSRuntime's exclusiveAccessOwner a js::Thread::Id …

…instead of a PRThread*; r=terrence
iaxat · Aug 8, 2016 · 6673f3f · 6673f3f
1 parent 833a2eb
commit 6673f3f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
@@ -749,7 +749,7 @@ class MOZ_RAII AutoLockForExclusiveAccess
             runtime->assertCanLock(ExclusiveAccessLock);
             runtime->exclusiveAccessLock.lock();
 #ifdef DEBUG
-            runtime->exclusiveAccessOwner = PR_GetCurrentThread();
+            runtime->exclusiveAccessOwner = mozilla::Some(ThisThread::GetId());
 #endif
         } else {
             MOZ_ASSERT(!runtime->mainThreadHasExclusiveAccess);
@@ -775,8 +775,8 @@ class MOZ_RAII AutoLockForExclusiveAccess
     ~AutoLockForExclusiveAccess() {
         if (runtime->numExclusiveThreads) {
 #ifdef DEBUG
-            MOZ_ASSERT(runtime->exclusiveAccessOwner == PR_GetCurrentThread());
-            runtime->exclusiveAccessOwner = nullptr;
+            MOZ_ASSERT(*runtime->exclusiveAccessOwner == ThisThread::GetId());
+            runtime->exclusiveAccessOwner.reset();
 #endif
             runtime->exclusiveAccessLock.unlock();
         } else {

diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
@@ -161,7 +161,6 @@ JSRuntime::JSRuntime(JSRuntime* parentRuntime)
     promiseRejectionTrackerCallback(nullptr),
     promiseRejectionTrackerCallbackData(nullptr),
 #ifdef DEBUG
-    exclusiveAccessOwner(nullptr),
     mainThreadHasExclusiveAccess(false),
 #endif
     numExclusiveThreads(0),
@@ -432,7 +431,7 @@ JSRuntime::destroyRuntime()
      */
     finishSelfHosting();
 
-    MOZ_ASSERT(!exclusiveAccessOwner);
+    MOZ_ASSERT(exclusiveAccessOwner.isNothing());
 
     MOZ_ASSERT(!numExclusiveThreads);
     AutoLockForExclusiveAccess lock(this);
@@ -899,7 +898,8 @@ JSRuntime::assertCanLock(RuntimeLock which)
     // it must be done in the order below.
     switch (which) {
       case ExclusiveAccessLock:
-        MOZ_ASSERT(exclusiveAccessOwner != PR_GetCurrentThread());
+        MOZ_ASSERT_IF(exclusiveAccessOwner.isSome(),
+                      exclusiveAccessOwner.ref() != js::ThisThread::GetId());
         MOZ_FALLTHROUGH;
       case HelperThreadStateLock:
         MOZ_FALLTHROUGH;

diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
@@ -39,6 +39,7 @@
 #endif
 #include "js/UniquePtr.h"
 #include "js/Vector.h"
+#include "threading/Thread.h"
 #include "vm/CodeCoverage.h"
 #include "vm/CommonPropertyNames.h"
 #include "vm/DateTime.h"
@@ -694,7 +695,7 @@ struct JSRuntime : public JS::shadow::Runtime,
      */
     js::Mutex exclusiveAccessLock;
 #ifdef DEBUG
-    PRThread* exclusiveAccessOwner;
+    mozilla::Maybe<js::Thread::Id> exclusiveAccessOwner;
     bool mainThreadHasExclusiveAccess;
 #endif
 
@@ -710,7 +711,7 @@ struct JSRuntime : public JS::shadow::Runtime,
 #ifdef DEBUG
     bool currentThreadHasExclusiveAccess() {
         return (!numExclusiveThreads && mainThreadHasExclusiveAccess) ||
-               exclusiveAccessOwner == PR_GetCurrentThread();
+               exclusiveAccessOwner == mozilla::Some(js::ThisThread::GetId());
     }
 #endif // DEBUG