儲存庫 vbox 的更動 101946

時間撮記:

2023-11-7 下午03:16:08 (13 月 以前)

作者:

vboxsync

訊息:

libs/xpcom: Convert plarena.c to use IPRT, bugref:10545

位置:

trunk/src/libs/xpcom18a4/nsprpub/lib/ds

檔案:

• plarena.c (修改) (10 筆差異)
• plarena.h (修改) (1 筆差異)

trunk/src/libs/xpcom18a4/nsprpub/lib/ds/plarena.c

@@ -45 +45 @@
 #include <string.h>
 #include "plarena.h"
-#include "prmem.h"
 #include "prbit.h"
-#include "prlog.h"
-#include "prlock.h"
-#include "prinit.h"
+
+#include <iprt/assert.h>
+#include <iprt/errcore.h>
+#include <iprt/mem.h>
+#include <iprt/once.h>
+#include <iprt/semaphore.h>
 
 static PLArena *arena_freelist;
 
-#define COUNT(pool,what)
 #define PL_ARENA_DEFAULT_ALIGN  sizeof(double)
 
-static PRLock    *arenaLock;
-static PRCallOnceType once;
+static RTSEMFASTMUTEX g_hMtxArena = NIL_RTSEMFASTMUTEX;
+static RTONCE         g_rtOnce    = RTONCE_INITIALIZER;
 
 /*
@@ -73 +74 @@
 **
 */
-static PRStatus InitializeArenas( void )
-{
-    PR_ASSERT( arenaLock == NULL );
-    arenaLock = PR_NewLock();
-    if ( arenaLock == NULL )
+static DECLCALLBACK(int) InitializeArenas(void *pvUser)
+{
+    RT_NOREF(pvUser);
+    Assert(g_hMtxArena == NIL_RTSEMFASTMUTEX);
+
+    return RTSemFastMutexCreate(&g_hMtxArena);
+} /* end ArenaInitialize() */
+
+static PRStatus LockArena( void )
+{
+    int vrc = RTOnce(&g_rtOnce, InitializeArenas, NULL /*pvUser*/);
+    if (RT_FAILURE(vrc))
         return PR_FAILURE;
-    else
-        return PR_SUCCESS;
-} /* end ArenaInitialize() */
-
-static PRStatus LockArena( void )
-{
-    PRStatus rc = PR_CallOnce( &once, InitializeArenas );
-
-    if ( PR_FAILURE != rc )
-        PR_Lock( arenaLock );
-    return(rc);
+
+    RTSemFastMutexRequest(g_hMtxArena);
+    return PR_SUCCESS;
 } /* end LockArena() */
 
 static void UnlockArena( void )
 {
-    PR_Unlock( arenaLock );
+    RTSemFastMutexRelease(g_hMtxArena);
     return;
 } /* end UnlockArena() */
@@ -147 +147 @@
     PRUint32 nbOld;
 
-    PR_ASSERT((nb & pool->mask) == 0);
-    
+    Assert((nb & pool->mask) == 0);
+
     nbOld = nb;
     nb = (PRUword)PL_ARENA_ALIGN(pool, nb); /* force alignment */
@@ -202 +202 @@
         PRUint32 sz = PR_MAX(pool->arenasize, nb);
         sz += sizeof *a + pool->mask;  /* header and alignment slop */
-        a = (PLArena*)PR_MALLOC(sz);
+        a = (PLArena*)RTMemAlloc(sz);
         if ( NULL != a )  {
             a->limit = (PRUword)a + sz;
@@ -208 +208 @@
             rp = (char *)a->avail;
             a->avail += nb;
-            PR_ASSERT(a->avail <= a->limit);
+            Assert(a->avail <= a->limit);
             /* the newly allocated arena is linked after pool->current 
             *  and becomes pool->current */
@@ -217 +217 @@
                 pool->first.next = a;
             PL_COUNT_ARENA(pool,++);
-            COUNT(pool, nmallocs);
             return(rp);
         }
@@ -254 +253 @@
 #ifdef DEBUG
     do {
-        PR_ASSERT(a->base <= a->avail && a->avail <= a->limit);
+        Assert(a->base <= a->avail && a->avail <= a->limit);
         a->avail = a->base;
         PL_CLEAR_UNUSED(a);
@@ -266 +265 @@
             PL_CLEAR_ARENA(a);
             PL_COUNT_ARENA(pool,--);
-            PR_DELETE(a);
+            RTMemFree(a);
         } while ((a = *ap) != 0);
     } else {
@@ -299 +298 @@
 {
     FreeArenaList(pool, &pool->first, PR_FALSE);
-    COUNT(pool, ndeallocs);
 }
 
@@ -317 +315 @@
     for (a = arena_freelist; a; a = next) {
         next = a->next;
-        PR_DELETE(a);
+        RTMemFree(a);
     }
     arena_freelist = NULL;
 
-    if (arenaLock) {
-        PR_DestroyLock(arenaLock);
-        arenaLock = NULL;
-    }
-}
-
+    if (g_hMtxArena != NIL_RTSEMFASTMUTEX) {
+        RTSemFastMutexDestroy(g_hMtxArena);
+        g_hMtxArena = NIL_RTSEMFASTMUTEX;
+    }
+}
+

trunk/src/libs/xpcom18a4/nsprpub/lib/ds/plarena.h

@@ -123 +123 @@
 #ifdef DEBUG
 #define PL_FREE_PATTERN 0xDA
-#define PL_CLEAR_UNUSED(a) (PR_ASSERT((a)->avail <= (a)->limit), \
+#define PL_CLEAR_UNUSED(a) Assert((a)->avail <= (a)->limit); \
                            memset((void*)(a)->avail, PL_FREE_PATTERN, \
-                           (a)->limit - (a)->avail))
+                           (a)->limit - (a)->avail)
 #define PL_CLEAR_ARENA(a)  memset((void*)(a), PL_FREE_PATTERN, \
                            (a)->limit - (PRUword)(a))