Changeset 31253 in vbox

Timestamp:

Jul 30, 2010 3:41:43 PM (15 years ago)

Author:

vboxsync

Message:

xpcom/nspr: Use RTMem* for memory alloc so that we can more easily wrap direct it to the electric fence heap.

File:

• trunk/src/libs/xpcom18a4/nsprpub/pr/src/malloc/prmem.c (modified) (16 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/malloc/prmem.c

@@ -41 +41 @@
 
 #include "primpl.h"
+#ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+# include <iprt/mem.h>
+#endif
 
 #ifdef _PR_ZONE_ALLOCATOR
@@ -54 +57 @@
 */
 
-#include <string.h>     
+#include <string.h>
 
 union memBlkHdrUn;
@@ -92 +95 @@
 void
 _PR_DestroyZones(void)
-{   
+{
     int i, j;
 
     if (!use_zone_allocator)
         return;
-    
+
     for (j = 0; j < THREAD_POOLS; j++) {
         for (i = 0; i < MEM_ZONES; i++) {
@@ -109 +112 @@
             }
         }
-    } 
+    }
     use_zone_allocator = PR_FALSE;
-} 
+}
 
 /*
@@ -184 +187 @@
         return;
 
-    for (j = 0; j < THREAD_POOLS; j++) { 
+    for (j = 0; j < THREAD_POOLS; j++) {
         for (i = 0; i < MEM_ZONES; i++) {
             MemoryZone *mz = &zones[i][j];
@@ -191 +194 @@
             if (rv != 0) {
                 goto loser;
-            } 
+            }
             mz->blockSize = 16 << ( 2 * i);
         }
@@ -365 +368 @@
         PR_ASSERT(mt->s.zone  == mb->s.zone);
         PR_ASSERT(mt->s.blockSize == blockSize);
-        
+
         if (bytes <= blockSize) {
             /* The block is already big enough. */
@@ -373 +376 @@
         ours = 1;
     }
-    
+
     rv = pr_ZoneMalloc(bytes);
     if (rv) {
@@ -438 +441 @@
     if (!_pr_initialized) _PR_ImplicitInitialization();
 
+#ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+    return use_zone_allocator ? pr_ZoneMalloc(size) : RTMemAlloc(size);
+#else
     return use_zone_allocator ? pr_ZoneMalloc(size) : malloc(size);
+#endif
 }
 
@@ -446 +453 @@
 
     return use_zone_allocator ?
+#ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+        pr_ZoneCalloc(nelem, elsize) : RTMemAllocZ(nelem * (size_t)elsize);
+#else
         pr_ZoneCalloc(nelem, elsize) : calloc(nelem, elsize);
+#endif
 }
 
@@ -453 +464 @@
     if (!_pr_initialized) _PR_ImplicitInitialization();
 
+#ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+    return use_zone_allocator ? pr_ZoneRealloc(ptr, size) : RTMemRealloc(ptr, size);
+#else
     return use_zone_allocator ? pr_ZoneRealloc(ptr, size) : realloc(ptr, size);
+#endif
 }
 
@@ -461 +476 @@
         pr_ZoneFree(ptr);
     else
+#ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+        RTMemFree(ptr);
+#else
         free(ptr);
+#endif
 }
 
@@ -479 +498 @@
     return PR_MD_malloc( (size_t) size);
 #else
+# ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+    return RTMemAlloc(size);
+# else
     return malloc(size);
+# endif
 #endif
 }
@@ -487 +510 @@
 #if defined (WIN16)
     return PR_MD_calloc( (size_t)nelem, (size_t)elsize );
-    
-#else
+
+#else
+# ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+    return RTMemAllocZ(nelem * (size_t)elsize);
+# else
     return calloc(nelem, elsize);
+# endif
 #endif
 }
@@ -498 +525 @@
     return PR_MD_realloc( ptr, (size_t) size);
 #else
+# ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+    return RTMemRealloc(ptr, size);
+# else
     return realloc(ptr, size);
+# endif
 #endif
 }
@@ -507 +538 @@
     PR_MD_free( ptr );
 #else
+# ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+    RTMemFree(ptr);
+# else
     free(ptr);
+# endif
 #endif
 }