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

Timestamp:

Nov 8, 2023 1:38:41 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom/xpcom/components: Convert some code from using PRLock to IPRT's RTSEMFASTMUTEX locks, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/components

Files:

• nsCategoryManager.cpp (modified) (21 diffs)
• nsCategoryManager.h (modified) (4 diffs)

trunk/src/libs/xpcom18a4/xpcom/components/nsCategoryManager.cpp

@@ -58 +58 @@
 #include "nsEnumeratorUtils.h"
 
+#include <iprt/assert.h>
+#include <iprt/errcore.h>
+
 class nsIComponentLoaderManager;
 
@@ -216 +219 @@
   }
 
-  node->mLock = PR_NewLock();
-  if (!node->mLock) {
+  node->mLock = NIL_RTSEMFASTMUTEX;
+  int vrc = RTSemFastMutexCreate(&node->mLock);
+  if (RT_FAILURE(vrc)) {
     delete node;
     return nsnull;
@@ -227 +231 @@
 CategoryNode::~CategoryNode()
 {
-  if (mLock)
-    PR_DestroyLock(mLock);
+  if (mLock != NIL_RTSEMFASTMUTEX)
+  {
+    RTSemFastMutexDestroy(mLock);
+    mLock = NIL_RTSEMFASTMUTEX;
+  }
 }
 
@@ -243 +250 @@
                       char** _retval)
 {
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   nsresult rv = NS_ERROR_NOT_AVAILABLE;
   CategoryLeaf* ent =
@@ -254 +261 @@
       rv = NS_OK;
   }
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   return rv;
@@ -267 +274 @@
                       PLArenaPool* aArena)
 {
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   CategoryLeaf* leaf = 
     mTable.GetEntry(aEntryName);
@@ -298 +305 @@
   }
     
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
   return rv;
 }
@@ -308 +315 @@
   // we don't throw any errors, because it normally doesn't matter
   // and it makes JS a lot cleaner
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
 
   if (aDontPersist) {
@@ -326 +333 @@
     }
   }
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   return NS_OK;
@@ -336 +343 @@
   NS_ENSURE_ARG_POINTER(_retval);
 
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   EntryEnumerator* enumObj = EntryEnumerator::Create(mTable);
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   if (!enumObj)
@@ -385 +392 @@
   };
 
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   mTable.EnumerateEntries(enumfunc_pentries, &args);
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   return args.success;
@@ -463 +470 @@
   }
 
-  manager->mLock = PR_NewLock();
-
-  if (!manager->mLock) {
+  manager->mLock = NIL_RTSEMFASTMUTEX;
+  int vrc = RTSemFastMutexCreate(&manager->mLock);
+  if (RT_FAILURE(vrc))
+  {
     delete manager;
     return nsnull;
@@ -475 +483 @@
 nsCategoryManager::~nsCategoryManager()
 {
-  if (mLock)
-    PR_DestroyLock(mLock);
+  if (mLock != NIL_RTSEMFASTMUTEX)
+  {
+    RTSemFastMutexDestroy(mLock);
+    mLock = NIL_RTSEMFASTMUTEX;
+  }
 
   // the hashtable contains entries that must be deleted before the arena is
@@ -506 +517 @@
   nsresult status = NS_ERROR_NOT_AVAILABLE;
 
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   CategoryNode* category = get_category(aCategoryName);
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   if (category) {
@@ -531 +542 @@
   // Before we can insert a new entry, we'll need to
   //  find the |CategoryNode| to put it in...
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   CategoryNode* category = get_category(aCategoryName);
 
@@ -541 +552 @@
     mTable.Put(categoryName, category);
   }
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   if (!category)
@@ -568 +579 @@
   */
 
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   CategoryNode* category = get_category(aCategoryName);
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   if (!category)
@@ -588 +599 @@
   // leaf nodes.
 
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   CategoryNode* category = get_category(aCategoryName);
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   if (category)
@@ -605 +616 @@
   NS_ENSURE_ARG_POINTER(_retval);
 
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   CategoryNode* category = get_category(aCategoryName);
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
   
   if (!category) {
@@ -621 +632 @@
   NS_ENSURE_ARG_POINTER(_retval);
 
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   CategoryEnumerator* enumObj = CategoryEnumerator::Create(mTable);
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   if (!enumObj)
@@ -661 +672 @@
   };
 
-  PR_Lock(mLock);
+  RTSemFastMutexRequest(mLock);
   mTable.EnumerateRead(enumfunc_categories, &args);
-  PR_Unlock(mLock);
+  RTSemFastMutexRelease(mLock);
 
   if (!args.success) {

trunk/src/libs/xpcom18a4/xpcom/components/nsCategoryManager.h

@@ -41 +41 @@
 
 #include "prio.h"
-#include "prlock.h"
 #include "plarena.h"
 #include "nsClassHashtable.h"
 #include "nsICategoryManager.h"
+
+#include <iprt/semaphore.h>
 
 #define NS_CATEGORYMANAGER_CLASSNAME     "Category Manager"
@@ -95 +96 @@
 
   void Clear() {
-    PR_Lock(mLock);
+    RTSemFastMutexRequest(mLock);
     mTable.Clear();
-    PR_Unlock(mLock);
+    RTSemFastMutexRelease(mLock);
   }
 
   PRUint32 Count() {
-    PR_Lock(mLock);
+    RTSemFastMutexRequest(mLock);
     PRUint32 tCount = mTable.Count();
-    PR_Unlock(mLock);
+    RTSemFastMutexRelease(mLock);
     return tCount;
   }
@@ -121 +122 @@
 
   nsTHashtable<CategoryLeaf> mTable;
-  PRLock* mLock;
+  RTSEMFASTMUTEX mLock;
 };
 
@@ -154 +155 @@
   PLArenaPool mArena;
   nsClassHashtable<nsDepCharHashKey, CategoryNode> mTable;
-  PRLock* mLock;
+  RTSEMFASTMUTEX mLock;
 };