Changeset 101966 in vbox

Timestamp:

Nov 8, 2023 12:30:30 PM (13 months ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd

Files:

• client/src/ipcdclient.cpp (modified) (3 diffs)
• extensions/dconnect/src/ipcDConnectService.cpp (modified) (9 diffs)
• shared/src/ipcm.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp

@@ -57 +57 @@
 #include "prio.h"
 #include "prproces.h"
-#include "pratom.h"
-
+
+#include <iprt/asm.h>
 #include <iprt/critsect.h>
 
@@ -73 +73 @@
 
   // threadsafe addref/release
-  NS_HIDDEN_(nsrefcnt) AddRef()  { return PR_AtomicIncrement(&refcnt); }
-  NS_HIDDEN_(nsrefcnt) Release() { PRInt32 r = PR_AtomicDecrement(&refcnt); if (r == 0) delete this; return r; }
+  NS_HIDDEN_(nsrefcnt) AddRef()  { return ASMAtomicIncU32(&refcnt); }
+  NS_HIDDEN_(nsrefcnt) Release() { uint32_t r = ASMAtomicDecU32(&refcnt); if (r == 0) delete this; return r; }
 
   NS_HIDDEN_(void) SetObserver(ipcIMessageObserver *aObserver, PRBool aOnCurrentThread);
@@ -109 +109 @@
   }
 
-  PRInt32 refcnt;
+  volatile uint32_t refcnt;
 };
 

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -55 +55 @@
 # include <map>
 # include <list>
+# include <iprt/asm.h>
 # include <iprt/err.h>
 # include <iprt/req.h>
@@ -254 +255 @@
     NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt");
     nsrefcnt count;
-    count = PR_AtomicIncrement((PRInt32*)&mRefCnt);
+    count = ASMAtomicIncU32((volatile uint32_t *)&mRefCnt);
     return count;
   }
@@ -262 +263 @@
     nsrefcnt count;
     NS_PRECONDITION(0 != mRefCnt, "dup release");
-    count = PR_AtomicDecrement((PRInt32 *)&mRefCnt);
+    count = ASMAtomicDecU32((volatile uint32_t *)&mRefCnt);
     if (0 == count) {
       NS_PRECONDITION(PRInt32(mRefCntIPC) == 0, "non-zero IPC refcnt");
@@ -278 +279 @@
   {
     NS_PRECONDITION(PRInt32(mRefCntIPC) >= 0, "illegal refcnt");
-    nsrefcnt count = PR_AtomicIncrement((PRInt32*)&mRefCntIPC);
+    nsrefcnt count = ASMAtomicIncU32((volatile uint32_t *)&mRefCntIPC);
     return count;
   }
@@ -287 +288 @@
   {
     NS_PRECONDITION(0 != mRefCntIPC, "dup release");
-    nsrefcnt count = PR_AtomicDecrement((PRInt32 *)&mRefCntIPC);
+    nsrefcnt count = ASMAtomicDecU32((volatile uint32_t *)&mRefCntIPC);
     if (0 == count) {
       // If the last IPC reference is released, remove this instance from the map.
@@ -1268 +1269 @@
 NewRequestIndex()
 {
-  static PRInt32 sRequestIndex;
-  return (PRUint32) PR_AtomicIncrement(&sRequestIndex);
+  static volatile uint32_t sRequestIndex = 0;
+  return ASMAtomicIncU32(&sRequestIndex);
 }
 
@@ -2255 +2256 @@
 {
   nsrefcnt count;
-  count = PR_AtomicIncrement((PRInt32*)&mRefCnt);
+  count = ASMAtomicIncU32((volatile uint32_t *)&mRefCnt);
   NS_LOG_ADDREF(this, count, "DConnectStub", sizeof(*this));
   return count;
@@ -2276 +2277 @@
     nsAutoLock stubLock (dConnect->StubLock());
 
-    count = PR_AtomicDecrement((PRInt32 *)&mRefCnt);
+    count = ASMAtomicDecU32((volatile uint32_t *)&mRefCnt);
     NS_LOG_RELEASE(this, count, "DConnectStub");
 
@@ -2335 +2336 @@
   else
   {
-    count = PR_AtomicDecrement((PRInt32 *)&mRefCnt);
+    count = ASMAtomicDecU32((volatile uint32_t *)&mRefCnt);
     NS_LOG_RELEASE(this, count, "DConnectStub");
   }

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcm.cpp

@@ -38 +38 @@
 #include <string.h>
 #include "ipcm.h"
-#include "pratom.h"
+
+#include <iprt/asm.h>
 
 const nsID IPCM_TARGET =
@@ -51 +52 @@
 IPCM_NewRequestIndex()
 {
-    static PRInt32 sRequestIndex;
-    return (PRUint32) PR_AtomicIncrement(&sRequestIndex);
+    static volatile uint32_t sRequestIndex = 0;
+    return ASMAtomicIncU32(&sRequestIndex);
 }