Changeset 69971 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Dec 7, 2017 11:16:53 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119477

Message:

iprt/memtracker: Add the caller address to the tracking information.

File:

• trunk/src/VBox/Runtime/r3/alloc.cpp (modified) (5 diffs)

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

@@ -29 +29 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
+#define RTMEMALLOC_USE_TRACKER
 #if defined(RTMEM_WRAP_TO_EF_APIS) && !defined(RTMEM_NO_WRAP_TO_EF_APIS)
 # undef RTMEM_WRAP_TO_EF_APIS
@@ -113 +114 @@
     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);
+    void *pv = RTMemTrackerHdrAlloc(malloc(cb + sizeof(RTMEMTRACKERHDR)), cb, pszTag, ASMReturnAddress(), RTMEMTRACKERMETHOD_ALLOC);
 # else
     void *pv = malloc(cb); NOREF(pszTag);
@@ -137 +138 @@
 
 # ifdef RTMEMALLOC_USE_TRACKER
-    void *pv = RTMemTrackerHdrAlloc(calloc(1, cb + sizeof(RTMEMTRACKERHDR)), cb, pszTag, RTMEMTRACKERMETHOD_ALLOCZ);
+    void *pv = RTMemTrackerHdrAlloc(calloc(1, cb + sizeof(RTMEMTRACKERHDR)), cb, pszTag, ASMReturnAddress(), RTMEMTRACKERMETHOD_ALLOCZ);
 #else
     void *pv = calloc(1, cb); NOREF(pszTag);
@@ -191 +192 @@
 
 # ifdef RTMEMALLOC_USE_TRACKER
-    void *pvRealOld  = RTMemTrackerHdrReallocPrep(pvOld, 0, pszTag);
+    void *pvRealOld  = RTMemTrackerHdrReallocPrep(pvOld, 0, pszTag, ASMReturnAddress());
     size_t cbRealNew = cbNew || !pvRealOld ? cbNew + sizeof(RTMEMTRACKERHDR) : 0;
     void *pvNew      = realloc(pvRealOld, cbRealNew);
-    void *pv         = RTMemTrackerHdrReallocDone(pvNew, cbNew, pvOld, pszTag);
+    void *pv         = RTMemTrackerHdrReallocDone(pvNew, cbNew, pvOld, pszTag, ASMReturnAddress());
 # else
     void *pv = realloc(pvOld, cbNew); NOREF(pszTag);
@@ -215 +216 @@
 #else
 # ifdef RTMEMALLOC_USE_TRACKER
-        pv = RTMemTrackerHdrFree(pv, 0, NULL, RTMEMTRACKERMETHOD_FREE);
+        pv = RTMemTrackerHdrFree(pv, 0, NULL, ASMReturnAddress(), RTMEMTRACKERMETHOD_FREE);
 # endif
         free(pv);