vbox的更動 32125 路徑 trunk/src/VBox/Runtime/r3/alloc.cpp

時間撮記:

2010-8-31 上午10:16:05 (14 年 以前)

作者:

vboxsync

訊息:

iprt/memtracker: hacking in progress.

檔案:

• trunk/src/VBox/Runtime/r3/alloc.cpp (修改) (5 筆差異)

trunk/src/VBox/Runtime/r3/alloc.cpp

@@ -42 +42 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#ifdef RTMEMALLOC_USE_TRACKER
+# include <iprt/memtracker.h>
+#endif
 #include <iprt/param.h>
 #include <iprt/string.h>
@@ -95 +98 @@
 
     AssertMsg(cb, ("Allocating ZERO bytes is really not a good idea! Good luck with the next assertion!\n"));
+# ifdef RTMEMALLOC_USE_TRACKER
+    void *pv = RTMemTrackerHdrAlloc(malloc(cb + sizeof(RTMEMTRACKERHDR)), cb, pszTag, RTMEMTRACKERMETHOD_ALLOC);
+# else
     void *pv = malloc(cb);
+# endif
     AssertMsg(pv, ("malloc(%#zx) failed!!!\n", cb));
     AssertMsg(   cb < RTMEM_ALIGNMENT
@@ -115 +122 @@
     AssertMsg(cb, ("Allocating ZERO bytes is really not a good idea! Good luck with the next assertion!\n"));
 
+# ifdef RTMEMALLOC_USE_TRACKER
+    void *pv = RTMemTrackerHdrAlloc(calloc(1, cb + sizeof(RTMEMTRACKERHDR)), cb, pszTag, RTMEMTRACKERMETHOD_ALLOCZ);
+#else
     void *pv = calloc(1, cb);
+#endif
     AssertMsg(pv, ("calloc(1,%#zx) failed!!!\n", cb));
     AssertMsg(   cb < RTMEM_ALIGNMENT
@@ -165 +176 @@
 #else /* !RTALLOC_USE_EFENCE */
 
+# ifdef RTALLOC_USE_TRACKER
+    void *pv;
+    if (!pvOld)
+    {
+        if (cbNew)
+            pv = RTMemTrackerHdrAlloc(realloc(pvOld, cbNew + sizeof(RTMEMTRACKERHDR)), cbNew,
+                                      pszTag, RTMEMTRACKERMETHOD_REALLOC);
+        else
+            pv = NULL;
+    }
+    else
+    {
+        RTMemTrackerHdrReallocPrep(pvOld, 0, pszTag, RTMEMTRACKERMETHOD_REALLOC);
+        pv = RTMemTrackerHdrRealloc(realloc(pvOld, cbNew + sizeof(RTMEMTRACKERHDR)), cbNew, pvOld,
+                                    pszTag, RTMEMTRACKERMETHOD_REALLOC);
+    }
+# else
     void *pv = realloc(pvOld, cbNew);
+# endif
     AssertMsg(pv || !cbNew, ("realloc(%p, %#zx) failed!!!\n", pvOld, cbNew));
     AssertMsg(   cbNew < RTMEM_ALIGNMENT
@@ -182 +211 @@
         rtR3MemFree("Free", RTMEMTYPE_RTMEMFREE, pv, ASMReturnAddress(), NULL, 0, NULL);
 #else
+# ifdef RTALLOC_USE_TRACKER
+        pv = RTMemTrackerHdrFree(pv, 0, NULL, RTMEMTRACKERMETHOD_FREE);
+# endif
         free(pv);
 #endif