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

Timestamp:

Nov 7, 2023 10:24:20 AM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Get rid of PR_Lock support in nsAutoLock now that everything has been converted, bugref:10545

File:

• trunk/src/libs/xpcom18a4/xpcom/threads/nsAutoLock.h (modified) (5 diffs)

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

@@ -108 +108 @@
 
 #include "nscore.h"
-#include "prlock.h"
-#include "prlog.h"
 
 #include <iprt/assert.h>
@@ -135 +133 @@
 class NS_COM nsAutoLock : public nsAutoLockBase {
 private:
-    PRLock* mLock;
     /** The IPRT fast mutex. */
     RTSEMFASTMUTEX m_hMtx;
-    PRBool mLocked;
+    bool           m_fLocked;
 
     // Not meant to be implemented. This makes it a compiler error to
@@ -157 +154 @@
      * releases the lock.
      * 
-     * @param aLock A valid PRLock* returned from the NSPR's 
-     * PR_NewLock() function.
+     * @param hMtx A valid IPRT fast mutex.
      **/
-    nsAutoLock(PRLock* aLock)
-        : nsAutoLockBase(aLock, eAutoLock),
-          mLock(aLock),
-          m_hMtx(NIL_RTSEMFASTMUTEX),
-          mLocked(PR_TRUE) {
-        Assert(mLock);
-
-        // This will assert deep in the bowels of NSPR if you attempt
-        // to re-enter the lock.
-        PR_Lock(mLock);
-    }
-
     nsAutoLock(RTSEMFASTMUTEX hMtx)
         : nsAutoLockBase(hMtx, eAutoLock),
-          mLock(NULL),
           m_hMtx(hMtx),
-          mLocked(PR_TRUE) {
+          m_fLocked(true) {
         Assert(hMtx != NIL_RTSEMFASTMUTEX);
-
         RTSemFastMutexRequest(m_hMtx);
     }
 
     ~nsAutoLock(void) {
-        if (mLocked)
-        {
-            if (m_hMtx != NIL_RTSEMFASTMUTEX)
-                RTSemFastMutexRelease(m_hMtx);
-            else
-                PR_Unlock(mLock);
-        }
+        if (m_fLocked)
+            RTSemFastMutexRelease(m_hMtx);
     }
 
@@ -198 +175 @@
      **/  
     void lock() {
-        PR_ASSERT(!mLocked);
-        if (m_hMtx != NIL_RTSEMFASTMUTEX)
-            RTSemFastMutexRequest(m_hMtx);
-        else
-            PR_Lock(mLock);
-        mLocked = PR_TRUE;
+        Assert(!m_fLocked);
+        Assert(m_hMtx != NIL_RTSEMFASTMUTEX);
+        RTSemFastMutexRequest(m_hMtx);
+        m_fLocked = true;
     }
 
@@ -213 +188 @@
      **/ 
      void unlock() {
-        PR_ASSERT(mLocked);
-        if (m_hMtx != NIL_RTSEMFASTMUTEX)
-            RTSemFastMutexRelease(m_hMtx);
-        else
-            PR_Unlock(mLock);
-        mLocked = PR_FALSE;
+        Assert(m_fLocked);
+        Assert(m_hMtx != NIL_RTSEMFASTMUTEX);
+        RTSemFastMutexRelease(m_hMtx);
+        m_fLocked = false;
     }
 };