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

Timestamp:

Nov 8, 2023 12:44:46 PM (15 months ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/libs/xpcom18a4/xpcom

Files:

• glue/nsISupportsImpl.h (modified) (3 diffs)
• proxy/public/nsProxyEvent.h (modified) (1 diff)
• proxy/public/nsProxyRelease.h (modified) (2 diffs)
• proxy/src/nsProxyEvent.cpp (modified) (6 diffs)
• proxy/src/nsProxyEventObject.cpp (modified) (1 diff)
• reflect/xptinfo/src/xptiInterfaceInfo.cpp (modified) (2 diffs)
• string/src/nsSubstring.cpp (modified) (5 diffs)
• threads/nsThread.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/glue/nsISupportsImpl.h

@@ -47 +47 @@
 
 #include "prthread.h" /* needed for thread-safety checks */
-#include "pratom.h"   /* needed for PR_AtomicIncrement and PR_AtomicDecrement */
 
 #include "nsDebug.h"
@@ -740 +739 @@
   NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt");                   \
   nsrefcnt count;                                                             \
-  count = PR_AtomicIncrement((PRInt32*)&mRefCnt);                             \
+  count = ASMAtomicIncU32((volatile uint32_t *)&mRefCnt);                     \
   NS_LOG_ADDREF(this, count, #_class, sizeof(*this));                         \
   return count;                                                               \
@@ -793 +792 @@
   nsrefcnt count;                                                             \
   NS_PRECONDITION(0 != mRefCnt, "dup release");                               \
-  count = PR_AtomicDecrement((PRInt32 *)&mRefCnt);                            \
+  count = ASMAtomicDecI32((volatile uint32_t *)&mRefCnt);                     \
   NS_LOG_RELEASE(this, count, #_class);                                       \
   if (0 == count) {                                                           \

trunk/src/libs/xpcom18a4/xpcom/proxy/public/nsProxyEvent.h

@@ -167 +167 @@
     PRUint32         mParameterCount;            /* number of params */
     PLEvent         *mEvent;                     /* the current plevent */       
-    PRInt32          mCompleted;                 /* is true when the method has been called. */
+    volatile bool    mCompleted;                 /* is true when the method has been called. */
        
     nsCOMPtr<nsIEventQueue>  mCallersEventQ;     /* this is the eventQ that we must post a message back to 

trunk/src/libs/xpcom18a4/xpcom/proxy/public/nsProxyRelease.h

@@ -40 +40 @@
 
 #include "nsIEventQueueService.h"
-#include "pratom.h"
 #include "prmem.h"
 
@@ -64 +63 @@
 {                                                                               \
   NS_PRECONDITION(0 != mRefCnt, "dup release");                                 \
-  nsrefcnt count = PR_AtomicDecrement((PRInt32 *)&mRefCnt);                     \
+  nsrefcnt count = ASMAtomicDecU32((volatile uint32_t *)&mRefCnt);              \
   NS_LOG_RELEASE(this, count, #_class);                                         \
                                                                                 \

trunk/src/libs/xpcom18a4/xpcom/proxy/src/nsProxyEvent.cpp

@@ -54 +54 @@
 #include "nsCRT.h"
 
-#include "pratom.h"
 #include "prmem.h"
 #include "xptcall.h"
@@ -94 +93 @@
     NS_ASSERTION(event, "No PLEvent!");
 
-    mCompleted        = 0;
+    mCompleted        = false;
     mMethodIndex      = methodIndex;
     mParameterList    = parameterList;
@@ -232 +231 @@
 nsProxyObjectCallInfo::GetCompleted()
 {
-    return (PRBool)mCompleted;
+    return ASMAtomicReadBool(&mCompleted) ? PR_TRUE : PR_FALSE;
 }
 
@@ -238 +237 @@
 nsProxyObjectCallInfo::SetCompleted()
 {
-    PR_AtomicSet(&mCompleted, 1);
+    ASMAtomicWriteBool(&mCompleted, true);
 }
 
@@ -311 +310 @@
 nsProxyObject::AddRef()
 {
-  PR_AtomicIncrement((PRInt32 *)&mRefCnt);
+  ASMAtomicIncU32((volatile uint32_t *)&mRefCnt);
   NS_LOG_ADDREF(this, mRefCnt, "nsProxyObject", sizeof(*this));
 }
@@ -320 +319 @@
   NS_PRECONDITION(0 != mRefCnt, "dup release");
 
-  nsrefcnt count = PR_AtomicDecrement((PRInt32 *)&mRefCnt);
+  nsrefcnt count = ASMAtomicDecU32((volatile uint32_t *)&mRefCnt);
   NS_LOG_RELEASE(this, count, "nsProxyObject");
 

trunk/src/libs/xpcom18a4/xpcom/proxy/src/nsProxyEventObject.cpp

@@ -488 +488 @@
     // Decrement atomically - in case the Proxy Object Manager has already
     // been deleted and the monitor is unavailable...
-    count = PR_AtomicDecrement((PRInt32 *)&mRefCnt);
+    count = ASMAtomicDecU32((volatile uint32_t *)&mRefCnt);
     NS_LOG_RELEASE(this, count, "nsProxyEventObject");
     if (0 == count) {

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp

@@ -775 +775 @@
 xptiInterfaceInfo::AddRef(void)
 {
-    nsrefcnt cnt = (nsrefcnt) PR_AtomicIncrement((PRInt32*)&mRefCnt);
+    nsrefcnt cnt = (nsrefcnt) ASMAtomicIncU32((volatile uint32_t *)&mRefCnt);
     NS_LOG_ADDREF(this, cnt, "xptiInterfaceInfo", sizeof(*this));
     return cnt;
@@ -784 +784 @@
 {
     xptiInterfaceEntry* entry = mEntry;
-    nsrefcnt cnt = (nsrefcnt) PR_AtomicDecrement((PRInt32*)&mRefCnt);
+    nsrefcnt cnt = (nsrefcnt) ASMAtomicDecU32((volatile uint32_t *)&mRefCnt);
     NS_LOG_RELEASE(this, cnt, "xptiInterfaceInfo");
     if(!cnt)

trunk/src/libs/xpcom18a4/xpcom/string/src/nsSubstring.cpp

@@ -50 +50 @@
 #include "nsDependentString.h"
 #include "nsMemory.h"
-#include "pratom.h"
-#ifdef VBOX_USE_IPRT_IN_XPCOM
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+# include <iprt/asm.h>
 # include <iprt/mem.h>
 #endif
@@ -98 +98 @@
         }
 
-      PRInt32 mAllocCount;
-      PRInt32 mReallocCount;
-      PRInt32 mFreeCount;
-      PRInt32 mShareCount;
-      PRInt32 mAdoptCount;
-      PRInt32 mAdoptFreeCount;
+      volatile uint32_t mAllocCount;
+      volatile uint32_t mReallocCount;
+      volatile uint32_t mFreeCount;
+      volatile uint32_t mShareCount;
+      volatile uint32_t mAdoptCount;
+      volatile uint32_t mAdoptFreeCount;
   };
 static nsStringStats gStringStats;
-#define STRING_STAT_INCREMENT(_s) PR_AtomicIncrement(&gStringStats.m ## _s ## Count)
+#define STRING_STAT_INCREMENT(_s) ASMAtomicIncU32(&gStringStats.m ## _s ## Count)
 #else
 #define STRING_STAT_INCREMENT(_s)
@@ -126 +126 @@
     private:
 
-      PRInt32  mRefCount;
+      volatile uint32_t mRefCount;
       PRUint32 mStorageSize;
 
@@ -133 +133 @@
       void AddRef()
         {
-          PR_AtomicIncrement(&mRefCount);
+          ASMAtomicIncU32(&mRefCount);
           STRING_STAT_INCREMENT(Share);
         }
@@ -139 +139 @@
       void Release()
         {
-          if (PR_AtomicDecrement(&mRefCount) == 0)
+          if (ASMAtomicDecU32(&mRefCount) == 0)
             {
               STRING_STAT_INCREMENT(Free);

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

@@ -54 +54 @@
 #include "nsCOMPtr.h"
 
+#include "prlock.h"
+
 #include <iprt/thread.h>