Changeset 101957 in vbox for trunk/src

Timestamp:

Nov 8, 2023 10:50:00 AM (16 months ago)

Author:

vboxsync

Message:

libs/xpcom: Convert nsExceptionService.{cpp,h} to IPRT, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/base

Files:

• nsExceptionService.cpp (modified) (13 diffs)
• nsExceptionService.h (modified) (2 diffs)

trunk/src/libs/xpcom18a4/xpcom/base/nsExceptionService.cpp

@@ -43 +43 @@
 #include "prthread.h"
 #include "prlock.h"
-static const PRUintn BAD_TLS_INDEX = (PRUintn) -1;
-
-#define CHECK_SERVICE_USE_OK() if (tlsIndex == BAD_TLS_INDEX) return NS_ERROR_NOT_INITIALIZED
-#define CHECK_MANAGER_USE_OK() if (!mService || nsExceptionService::tlsIndex == BAD_TLS_INDEX) return NS_ERROR_NOT_INITIALIZED
+
+#include <iprt/asm.h>
+#include <iprt/errcore.h>
+
+#define CHECK_SERVICE_USE_OK() if (tlsIndex == NIL_RTTLS) return NS_ERROR_NOT_INITIALIZED
+#define CHECK_MANAGER_USE_OK() if (!mService || nsExceptionService::tlsIndex == NIL_RTTLS) return NS_ERROR_NOT_INITIALIZED
 
 // A key for our registered module providers hashtable
@@ -79 +81 @@
   nsExceptionService *mService; // not ref-counted
 #ifdef NS_DEBUG
-  static PRInt32 totalInstances;
+  static volatile uint32_t totalInstances;
 #endif
 
@@ -103 +105 @@
 
 #ifdef NS_DEBUG
-PRInt32 nsExceptionManager::totalInstances = 0;
+volatile uint32_t nsExceptionManager::totalInstances = 0;
 #endif
 
@@ -125 +127 @@
   /* member initializers and constructor code */
 #ifdef NS_DEBUG
-  PR_AtomicIncrement(&totalInstances);
+  ASMAtomicIncU32(&totalInstances);
 #endif
 }
@@ -133 +135 @@
   /* destructor code */
 #ifdef NS_DEBUG
-  PR_AtomicDecrement(&totalInstances);
+  ASMAtomicDecU32(&totalInstances);
 #endif // NS_DEBUG
 }
@@ -164 +166 @@
 /* The Exception Service */
 
-PRUintn nsExceptionService::tlsIndex = BAD_TLS_INDEX;
-PRLock *nsExceptionService::lock = nsnull;
+RTTLS nsExceptionService::tlsIndex = NIL_RTTLS;
+RTSEMFASTMUTEX nsExceptionService::lock = NIL_RTSEMFASTMUTEX;
 nsExceptionManager *nsExceptionService::firstThread = nsnull;
 
 #ifdef NS_DEBUG
-PRInt32 nsExceptionService::totalInstances = 0;
+volatile uint32_t nsExceptionService::totalInstances = 0;
 #endif
 
@@ -178 +180 @@
 {
 #ifdef NS_DEBUG
-  if (PR_AtomicIncrement(&totalInstances)!=1) {
+  if (ASMAtomicIncU32(&totalInstances)!=1) {
     NS_ERROR("The nsExceptionService is a singleton!");
   }
 #endif
   /* member initializers and constructor code */
-  if (tlsIndex == BAD_TLS_INDEX) {
-    PRStatus status;
-    status = PR_NewThreadPrivateIndex( &tlsIndex, ThreadDestruct );
-    NS_WARN_IF_FALSE(status==0, "ScriptErrorService could not allocate TLS storage.");
-  }
-  lock = PR_NewLock();
-  NS_WARN_IF_FALSE(lock, "Error allocating ExceptionService lock");
+  if (tlsIndex == NIL_RTTLS) {
+    int vrc = RTTlsAllocEx( &tlsIndex, ThreadDestruct );
+    NS_WARN_IF_FALSE(RT_SUCCESS(vrc), "ScriptErrorService could not allocate TLS storage.");
+  }
+  int vrc = RTSemFastMutexCreate(&lock);
+  NS_WARN_IF_FALSE(RT_SUCCESS(vrc), "Error allocating ExceptionService lock");
 
   // observe XPCOM shutdown.
@@ -201 +202 @@
 {
   Shutdown();
-  if (lock) {
-    PRLock *tmp = lock;
-    lock = nsnull;
-    PR_DestroyLock(tmp);
+  if (lock != NIL_RTSEMFASTMUTEX) {
+    RTSEMFASTMUTEX tmp = lock;
+    lock = NULL;
+    RTSemFastMutexDestroy(tmp);
   }
   /* destructor code */
 #ifdef NS_DEBUG
-  PR_AtomicDecrement(&totalInstances);
+  ASMAtomicDecU32(&totalInstances);
 #endif
 }
 
 /*static*/
-void nsExceptionService::ThreadDestruct( void *data )
-{
-  if (!lock) {
+DECLCALLBACK(void) nsExceptionService::ThreadDestruct( void *data )
+{
+  if (lock == NIL_RTSEMFASTMUTEX) {
     NS_WARNING("nsExceptionService ignoring thread destruction after shutdown");
     return;
@@ -225 +226 @@
 void nsExceptionService::Shutdown()
 {
-  PRUintn tmp = tlsIndex;
-  tlsIndex = BAD_TLS_INDEX;
-  PR_SetThreadPrivate(tmp, nsnull);
+  RTTLS tmp = tlsIndex;
+  tlsIndex = NIL_RTTLS;
+  RTTlsSet(tmp, NULL);
   mProviders.Reset();
-  if (lock) {
+  if (lock != NIL_RTSEMFASTMUTEX) {
     DropAllThreads();
   }
@@ -268 +269 @@
 {
     CHECK_SERVICE_USE_OK();
-    nsExceptionManager *mgr = (nsExceptionManager *)PR_GetThreadPrivate(tlsIndex);
+    nsExceptionManager *mgr = (nsExceptionManager *)RTTlsGet(tlsIndex);
     if (mgr == nsnull) {
         // Stick the new exception object in with no reference count.
@@ -274 +275 @@
         if (mgr == nsnull)
             return NS_ERROR_OUT_OF_MEMORY;
-        PR_SetThreadPrivate(tlsIndex, mgr);
+        RTTlsSet(tlsIndex, mgr);
         // The reference count is held in the thread-list
         AddThread(mgr);
@@ -345 +346 @@
 /*static*/ void nsExceptionService::AddThread(nsExceptionManager *thread)
 {
-    PR_Lock(lock);
+    RTSemFastMutexRequest(lock);
     thread->mNextThread = firstThread;
     firstThread = thread;
     NS_ADDREF(thread);
-    PR_Unlock(lock);
+    RTSemFastMutexRelease(lock);
 }
 
@@ -370 +371 @@
 /*static*/ void nsExceptionService::DropThread(nsExceptionManager *thread)
 {
-    PR_Lock(lock);
+    RTSemFastMutexRequest(lock);
     DoDropThread(thread);
-    PR_Unlock(lock);
+    RTSemFastMutexRelease(lock);
 }
 
 /*static*/ void nsExceptionService::DropAllThreads()
 {
-    PR_Lock(lock);
+    RTSemFastMutexRequest(lock);
     while (firstThread)
         DoDropThread(firstThread);
-    PR_Unlock(lock);
-}
+    RTSemFastMutexRelease(lock);
+}

trunk/src/libs/xpcom18a4/xpcom/base/nsExceptionService.h

@@ -47 +47 @@
 #include "nsIObserver.h"
 
+#include <iprt/semaphore.h>
+#include <iprt/thread.h>
+
 class nsExceptionManager;
 
@@ -79 +82 @@
   /* single lock protects both providers hashtable
      and thread list */
-  static PRLock* lock;
+  static RTSEMFASTMUTEX lock;
 
-  static PRUintn tlsIndex;
-  static void PR_CALLBACK ThreadDestruct( void *data );
+  static RTTLS tlsIndex;
+  static DECLCALLBACK(void) ThreadDestruct(void *data);
 #ifdef NS_DEBUG
-  static PRInt32 totalInstances;
+  static volatile uint32_t totalInstances;
 #endif