Changeset 101960 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Nov 8, 2023 11:04:10 AM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Convert nsThread.{cpp,h} to the IPRT RTTls* API, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/threads

Files:

• nsThread.cpp (modified) (5 diffs)
• nsThread.h (modified) (2 diffs)

trunk/src/libs/xpcom18a4/xpcom/threads/nsThread.cpp

@@ -41 +41 @@
 #include "nsAutoLock.h"
 
-PRUintn nsThread::kIThreadSelfIndex = 0;
+#include <iprt/assert.h>
+
+RTTLS nsThread::kIThreadSelfIndex = NIL_RTTLS;
 static nsIThread *gMainThread = 0;
 
@@ -135 +137 @@
 }
 
-void
+DECLCALLBACK(void)
 nsThread::Exit(void* arg)
 {
@@ -349 +351 @@
 nsThread::RegisterThreadSelf()
 {
-    PRStatus status;
-
-    if (kIThreadSelfIndex == 0) {
-        status = PR_NewThreadPrivateIndex(&kIThreadSelfIndex, Exit);
-        if (status != PR_SUCCESS) return NS_ERROR_FAILURE;
-    }
-
-    status = PR_SetThreadPrivate(kIThreadSelfIndex, this);
-    if (status != PR_SUCCESS) return NS_ERROR_FAILURE;
+    int vrc;
+
+    if (kIThreadSelfIndex == NIL_RTTLS) {
+        vrc = RTTlsAllocEx(&kIThreadSelfIndex, Exit);
+        if (RT_FAILURE(vrc)) return NS_ERROR_FAILURE;
+    }
+
+    vrc = RTTlsSet(kIThreadSelfIndex, this);
+    if (RT_FAILURE(vrc)) return NS_ERROR_FAILURE;
 
     return NS_OK;
@@ -380 +382 @@
 nsIThread::GetIThread(PRThread* prthread, nsIThread* *result)
 {
-    PRStatus status;
     nsThread* thread;
 
-    if (nsThread::kIThreadSelfIndex == 0) {
-        status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit);
-        if (status != PR_SUCCESS) return NS_ERROR_FAILURE;
-    }
-
-    thread = (nsThread*)PR_GetThreadPrivate(nsThread::kIThreadSelfIndex);
+    if (nsThread::kIThreadSelfIndex == NIL_RTTLS) {
+        int vrc = RTTlsAllocEx(&nsThread::kIThreadSelfIndex, nsThread::Exit);
+        if (RT_FAILURE(vrc)) return NS_ERROR_FAILURE;
+    }
+
+    thread = (nsThread*)RTTlsGet(nsThread::kIThreadSelfIndex);
     if (thread == nsnull) {
         // if the current thread doesn't have an nsIThread associated
@@ -450 +451 @@
         NS_WARN_IF_FALSE(cnt == 0, "Main thread being held past XPCOM shutdown.");
         gMainThread = nsnull;
-        
-        kIThreadSelfIndex = 0;
+
+        int vrc = RTTlsFree(kIThreadSelfIndex);
+        AssertRC(vrc); RT_NOREF(vrc);
+        kIThreadSelfIndex = NIL_RTTLS;
     }
 }

trunk/src/libs/xpcom18a4/xpcom/threads/nsThread.h

@@ -54 +54 @@
 #include "nsCOMPtr.h"
 
+#include <iprt/thread.h>
+
 class nsThread : public nsIThread 
 {
@@ -70 +72 @@
 
     static void PR_CALLBACK Main(void* arg);
-    static void PR_CALLBACK Exit(void* arg);
+    static DECLCALLBACK(void) Exit(void* arg);
     static void PR_CALLBACK Shutdown();
 
-    static PRUintn kIThreadSelfIndex;
+    static RTTLS kIThreadSelfIndex;
 
     static NS_METHOD