Changeset 101923 in vbox

Timestamp:

Nov 7, 2023 10:10:19 AM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom/java: Convert to use RTSEMFASTMUTEX for locking, bugref:10545

Location:

trunk/src/libs/xpcom18a4/java/src

Files:

• nsJavaXPCOMBindingUtils.cpp (modified) (5 diffs)
• nsJavaXPCOMBindingUtils.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/java/src/nsJavaXPCOMBindingUtils.cpp

@@ -105 +105 @@
 
 PRBool gJavaXPCOMInitialized = PR_FALSE;
-PRLock* gJavaXPCOMLock = nsnull;
+RTSEMFASTMUTEX gJavaXPCOMLock = NIL_RTSEMFASTMUTEX;
 
 static const char* kJavaKeywords[] = {
@@ -145 +145 @@
     return PR_TRUE;
 
+  int vrc = VINF_SUCCESS;
+
   // Save pointer to JavaVM, which is valid across threads.
   jint rc = env->GetJavaVM(&gCachedJVM);
@@ -339 +341 @@
   }
 
-  gJavaXPCOMLock = PR_NewLock();
+  vrc = RTSemFastMutexCreate(&gJavaXPCOMLock);
+  if (RT_FAILURE(vrc))
+    goto init_error;
+
   gJavaXPCOMInitialized = PR_TRUE;
   return PR_TRUE;
@@ -356 +361 @@
 FreeJavaGlobals(JNIEnv* env)
 {
-  PRLock* tempLock = nsnull;
+  RTSEMFASTMUTEX tempLock = NIL_RTSEMFASTMUTEX;
   if (gJavaXPCOMLock) {
-    PR_Lock(gJavaXPCOMLock);
+    RTSemFastMutexRequest(gJavaXPCOMLock);
 
     // null out global lock so no one else can use it
     tempLock = gJavaXPCOMLock;
-    gJavaXPCOMLock = nsnull;
+    gJavaXPCOMLock = NIL_RTSEMFASTMUTEX;
   }
 
@@ -443 +448 @@
   }
 
-  if (tempLock) {
-    PR_Unlock(tempLock);
-    PR_DestroyLock(tempLock);
+  if (tempLock != NIL_RTSEMFASTMUTEX) {
+    RTSemFastMutexRelease(tempLock);
+    RTSemFastMutexDestroy(tempLock);
   }
 }

trunk/src/libs/xpcom18a4/java/src/nsJavaXPCOMBindingUtils.h

@@ -120 +120 @@
 // finalizeProxy() function in nsJavaWrapper.cpp, we need to make sure that
 // all the structures touched by finalizeProxy() are multithread aware.
-extern PRLock* gJavaXPCOMLock;
+extern RTSEMFASTMUTEX gJavaXPCOMLock;
 
 extern PRBool gJavaXPCOMInitialized;