Changeset 101922 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Nov 7, 2023 10:04:33 AM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Convert xptiInterfaceInfoManager.{cpp,h} to use RTSEMFASTMUTEX for locking, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src

Files:

• xptiInterfaceInfoManager.cpp (modified) (3 diffs)
• xptiprivate.h (modified) (2 diffs)

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

@@ -111 +111 @@
 {
     return mWorkingSet.IsValid() &&
-           mResolveLock &&
-           mAutoRegLock &&
+           mResolveLock != NIL_RTSEMFASTMUTEX &&
+           mAutoRegLock != NIL_RTSEMFASTMUTEX &&
            mInfoMonitor &&
-           mAdditionalManagersLock;
+           mAdditionalManagersLock != NIL_RTSEMFASTMUTEX;
 }        
 
@@ -120 +120 @@
     :   mWorkingSet(aSearchPath),
         mOpenLogFile(nsnull),
-        mResolveLock(PR_NewLock()),
-        mAutoRegLock(PR_NewLock()),
+        mResolveLock(NIL_RTSEMFASTMUTEX),
+        mAutoRegLock(NIL_RTSEMFASTMUTEX),
         mInfoMonitor(nsAutoMonitor::NewMonitor("xptiInfoMonitor")),
-        mAdditionalManagersLock(PR_NewLock()),
+        mAdditionalManagersLock(NIL_RTSEMFASTMUTEX),
         mSearchPath(aSearchPath)
 {
+    int vrc = RTSemFastMutexCreate(&mResolveLock);
+    AssertRC(vrc); RT_NOREF(vrc);
+
+    vrc = RTSemFastMutexCreate(&mAutoRegLock);
+    AssertRC(vrc); RT_NOREF(vrc);
+
+    vrc = RTSemFastMutexCreate(&mAdditionalManagersLock);
+    AssertRC(vrc); RT_NOREF(vrc);
+
     const char* statsFilename = PR_GetEnv("MOZILLA_XPTI_STATS");
     if(statsFilename)
@@ -164 +173 @@
     mWorkingSet.InvalidateInterfaceInfos();
 
-    if(mResolveLock)
-        PR_DestroyLock(mResolveLock);
+    if(mResolveLock != NIL_RTSEMFASTMUTEX)
+        RTSemFastMutexDestroy(mResolveLock);
     if(mAutoRegLock)
-        PR_DestroyLock(mAutoRegLock);
+        RTSemFastMutexDestroy(mAutoRegLock);
     if(mInfoMonitor)
         nsAutoMonitor::DestroyMonitor(mInfoMonitor);
     if(mAdditionalManagersLock)
-        PR_DestroyLock(mAdditionalManagersLock);
+        RTSemFastMutexDestroy(mAdditionalManagersLock);
 
     gInterfaceInfoManager = nsnull;

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src/xptiprivate.h

@@ -890 +890 @@
         {NS_ADDREF(*aSearchPath = mSearchPath);}
 
-    static PRLock* GetResolveLock(xptiInterfaceInfoManager* self = nsnull) 
+    static RTSEMFASTMUTEX GetResolveLock(xptiInterfaceInfoManager* self = nsnull) 
         {if(!self && !(self = GetInterfaceInfoManagerNoAddRef())) 
             return nsnull;
          return self->mResolveLock;}
 
-    static PRLock* GetAutoRegLock(xptiInterfaceInfoManager* self = nsnull) 
+    static RTSEMFASTMUTEX GetAutoRegLock(xptiInterfaceInfoManager* self = nsnull) 
         {if(!self && !(self = GetInterfaceInfoManagerNoAddRef())) 
             return nsnull;
@@ -962 +962 @@
     nsCOMPtr<nsILocalFile>       mAutoRegLogFile;
     PRFileDesc*                  mOpenLogFile;
-    PRLock*                      mResolveLock;
-    PRLock*                      mAutoRegLock;
+    RTSEMFASTMUTEX               mResolveLock;
+    RTSEMFASTMUTEX               mAutoRegLock;
     PRMonitor*                   mInfoMonitor;
-    PRLock*                      mAdditionalManagersLock;
+    RTSEMFASTMUTEX               mAdditionalManagersLock;
     nsSupportsArray              mAdditionalManagers;
     nsCOMPtr<nsISupportsArray>   mSearchPath;