diff options
| author | Felix Geyer <debfx-pkg@fobos.de> | 2011-07-29 17:55:18 +0200 |
|---|---|---|
| committer | Felix Geyer <debfx-pkg@fobos.de> | 2011-07-29 17:55:18 +0200 |
| commit | cba113ca2826bc4814be2f69a7704c865a37d4ea (patch) | |
| tree | 511123b10dd1e58e56958520534f5c50e6f570fc /src/VBox/Runtime/r3/alloc.cpp | |
| parent | 6a16f6900dd884e07125b51c9625f6be0a1f9b70 (diff) | |
| download | virtualbox-cba113ca2826bc4814be2f69a7704c865a37d4ea.tar.gz | |
Imported Upstream version 4.1.0-dfsgupstream/4.1.0-dfsg
Diffstat (limited to 'src/VBox/Runtime/r3/alloc.cpp')
| -rw-r--r-- | src/VBox/Runtime/r3/alloc.cpp | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/VBox/Runtime/r3/alloc.cpp b/src/VBox/Runtime/r3/alloc.cpp index c8ddb7ea7..e790feabc 100644 --- a/src/VBox/Runtime/r3/alloc.cpp +++ b/src/VBox/Runtime/r3/alloc.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc.cpp $ */ +/* $Id: alloc.cpp 36597 2011-04-06 19:46:15Z vboxsync $ */ /** @file * IPRT - Memory Allocation. */ @@ -33,6 +33,12 @@ # define RTALLOC_USE_EFENCE 1 #endif +/*#define RTMEMALLOC_USE_TRACKER*/ +/* Don't enable the tracker when building the minimal IPRT. */ +#ifdef RT_MINI +# undef RTMEMALLOC_USE_TRACKER +#endif + /******************************************************************************* * Header Files * @@ -72,6 +78,8 @@ #undef RTMemDupEx #undef RTMemDupExTag +#undef RTALLOC_USE_EFENCE + RTDECL(void *) RTMemTmpAllocTag(size_t cb, const char *pszTag) RT_NO_THROW { @@ -177,22 +185,11 @@ RTDECL(void *) RTMemReallocTag(void *pvOld, size_t cbNew, const char *pszTag) R #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); - } +# ifdef RTMEMALLOC_USE_TRACKER + void *pvRealOld = RTMemTrackerHdrReallocPrep(pvOld, 0, pszTag); + size_t cbRealNew = cbNew || !pvRealOld ? cbNew + sizeof(RTMEMTRACKERHDR) : 0; + void *pvNew = realloc(pvRealOld, cbRealNew); + void *pv = RTMemTrackerHdrReallocDone(pvNew, cbNew, pvOld, pszTag); # else void *pv = realloc(pvOld, cbNew); # endif @@ -212,7 +209,7 @@ RTDECL(void) RTMemFree(void *pv) RT_NO_THROW #ifdef RTALLOC_USE_EFENCE rtR3MemFree("Free", RTMEMTYPE_RTMEMFREE, pv, ASMReturnAddress(), NULL, 0, NULL); #else -# ifdef RTALLOC_USE_TRACKER +# ifdef RTMEMALLOC_USE_TRACKER pv = RTMemTrackerHdrFree(pv, 0, NULL, RTMEMTRACKERMETHOD_FREE); # endif free(pv); |