Changeset 101978 in vbox

Timestamp:

Nov 8, 2023 1:44:31 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom/xpcom/io: Convert some code from using PRLock to IPRT's RTSEMFASTMUTEX locks, bugref:10545

File:

• trunk/src/libs/xpcom18a4/xpcom/io/nsNativeCharsetUtils.cpp (modified) (6 diffs)

trunk/src/libs/xpcom18a4/xpcom/io/nsNativeCharsetUtils.cpp

@@ -50 +50 @@
 #include <locale.h>   // setlocale
 #include "nscore.h"
-#include "prlock.h"
 #include "nsAString.h"
 #include "nsReadableUtils.h"
+
+#include <iprt/assert.h>
+#include <iprt/errcore.h>
+#include <iprt/semaphore.h>
 
 //
@@ -271 +274 @@
     static iconv_t gUTF8ToUnicode;
 #endif
-    static PRLock *gLock;
+    static RTSEMFASTMUTEX gLock;
     static PRBool  gInitialized;
 
     static void LazyInit();
 
-    static void Lock()   { if (gLock) PR_Lock(gLock);   }
-    static void Unlock() { if (gLock) PR_Unlock(gLock); }
+    static void Lock()   { if (gLock != NILRTSEMFASTMUTEX) RTSemFastMutexRequest(gLock); }
+    static void Unlock() { if (gLock != NILRTSEMFASTMUTEX) RTSemFastMutexRelease(gLock); }
 };
 
@@ -288 +291 @@
 iconv_t nsNativeCharsetConverter::gUTF8ToUnicode   = INVALID_ICONV_T;
 #endif
-PRLock *nsNativeCharsetConverter::gLock            = nsnull;
+RTSEMFASTMUTEX nsNativeCharsetConverter::gLock     = NIL_RTSEMFASTMUTEX;
 PRBool  nsNativeCharsetConverter::gInitialized     = PR_FALSE;
 
@@ -364 +367 @@
 nsNativeCharsetConverter::GlobalInit()
 {
-    gLock = PR_NewLock();
-    NS_ASSERTION(gLock, "lock creation failed");
+    int vrc = RTSemFastMutexCreate(&gLock);
+    NS_ASSERTION(RT_SUCCESS(vrc), "lock creation failed");
 }
 
@@ -371 +374 @@
 nsNativeCharsetConverter::GlobalShutdown()
 {
-    if (gLock) {
-        PR_DestroyLock(gLock);
-        gLock = nsnull;
+    if (gLock != NIL_RTSEMFASTMUTEX) {
+        RTSemFastMutexDestroy(gLock);
+        gLock = NIL_RTSEMFASTMUTEX;
     }
 
@@ -1279 +1282 @@
 
 #endif
+