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

Timestamp:

Nov 8, 2023 12:48:34 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom/nsprpub: Convert PR_Atomic* to ASMAtomic*, bugref:10545

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/private/primpl.h (modified) (1 diff)
• src/pthreads/ptsynch.c (modified) (5 diffs)
• src/pthreads/ptthread.c (modified) (2 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/primpl.h

@@ -333 +333 @@
     PRLock *lock;               /* associated lock that protects the condition */
     pthread_cond_t cv;          /* underlying pthreads condition */
-    PRInt32 notify_pending;     /* CV has destroy pending notification */
+    volatile uint32_t notify_pending;     /* CV has destroy pending notification */
 };
 

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c

@@ -48 +48 @@
 #include <sys/time.h>
 
+#include <iprt/asm.h>
+
 #ifdef VBOX
 /* From the removed obsolete/prsem.h */
@@ -133 +135 @@
 #if defined(DEBUG)
             pt_debug.cvars_notified += 1;
-            if (0 > PR_AtomicDecrement(&cv->notify_pending))
+            if (0 > ASMAtomicDecU32(&cv->notify_pending))
             {
                 pt_debug.delayed_cv_deletes += 1;
@@ -139 +141 @@
             }
 #else  /* defined(DEBUG) */
-            if (0 > PR_AtomicDecrement(&cv->notify_pending))
+            if (0 > ASMAtomicDecU32(&cv->notify_pending))
                 PR_DestroyCondVar(cv);
 #endif  /* defined(DEBUG) */
@@ -306 +308 @@
 
     /* A brand new entry in the array */
-    (void)PR_AtomicIncrement(&cvar->notify_pending);
+    (void)ASMAtomicIncU32(&cvar->notify_pending);
     notified->cv[index].times = (broadcast) ? -1 : 1;
     notified->cv[index].cv = cvar;
@@ -335 +337 @@
 PR_IMPLEMENT(void) PR_DestroyCondVar(PRCondVar *cvar)
 {
-    if (0 > PR_AtomicDecrement(&cvar->notify_pending))
+    if (0 > ASMAtomicDecU32(&cvar->notify_pending))
     {
         PRIntn rv = pthread_cond_destroy(&cvar->cv); PR_ASSERT(0 == rv);

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptthread.c

@@ -50 +50 @@
 #include <signal.h>
 
+#include <iprt/asm.h>
 #include <iprt/thread.h>
 #include <iprt/mem.h>
@@ -498 +499 @@
     {
         PRIntn rv;
-        (void)PR_AtomicIncrement(&cv->notify_pending);
+        ASMAtomicIncU32(&cv->notify_pending);
         rv = pthread_cond_broadcast(&cv->cv);
         PR_ASSERT(0 == rv);
-        if (0 > PR_AtomicDecrement(&cv->notify_pending))
+        if (0 > ASMAtomicDecU32(&cv->notify_pending))
             PR_DestroyCondVar(cv);
     }