Changeset 102173 in vbox

Timestamp:

Nov 21, 2023 8:18:58 AM (12 months ago)

Author:

vboxsync

Message:

libs/xpcom/nsprpub: Convert PR_Atomic* to ASMAtomic*, bugref:10545 [regression fix, notify_pending must be signed or some checks whether the cond var is in use fail]

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/private/primpl.h (modified) (1 diff)
• src/pthreads/ptsynch.c (modified) (4 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 */
-    volatile uint32_t notify_pending;     /* CV has destroy pending notification */
+    volatile int32_t notify_pending;     /* CV has destroy pending notification */
 };
 

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

@@ -136 +136 @@
 #if defined(DEBUG)
             pt_debug.cvars_notified += 1;
-            if (0 > ASMAtomicDecU32(&cv->notify_pending))
+            if (0 > ASMAtomicDecS32(&cv->notify_pending))
             {
                 pt_debug.delayed_cv_deletes += 1;
@@ -142 +142 @@
             }
 #else  /* defined(DEBUG) */
-            if (0 > ASMAtomicDecU32(&cv->notify_pending))
+            if (0 > ASMAtomicDecS32(&cv->notify_pending))
                 PR_DestroyCondVar(cv);
 #endif  /* defined(DEBUG) */
@@ -309 +309 @@
 
     /* A brand new entry in the array */
-    (void)ASMAtomicIncU32(&cvar->notify_pending);
+    (void)ASMAtomicIncS32(&cvar->notify_pending);
     notified->cv[index].times = (broadcast) ? -1 : 1;
     notified->cv[index].cv = cvar;
@@ -338 +338 @@
 PR_IMPLEMENT(void) PR_DestroyCondVar(PRCondVar *cvar)
 {
-    if (0 > ASMAtomicDecU32(&cvar->notify_pending))
+    if (0 > ASMAtomicDecS32(&cvar->notify_pending))
     {
         PRIntn rv = pthread_cond_destroy(&cvar->cv); Assert(0 == rv);