Changeset 28298 in vbox for trunk/src/VBox/Runtime/common/alloc

Timestamp:

Apr 14, 2010 12:20:39 PM (15 years ago)

Author:

vboxsync

Message:

iprt,Config.kmk: Make sure the RTMemAllocVar* alignment gets poisoned by the electric fence. Some interface refactoring.

File:

• trunk/src/VBox/Runtime/common/alloc/alloc.cpp (modified) (1 diff)

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

@@ -39 +39 @@
 #include <iprt/string.h>
 
-#ifdef RTMEM_WRAP_TO_EF_APIS
-# undef RTMemAllocVar
-# undef RTMemAllocZVar
-# undef RTMemDup
-# undef RTMemDupEx
-#endif
+#undef RTMemDup
+#undef RTMemDupEx
 
-
-
-/**
- * Wrapper around RTMemAlloc for automatically aligning variable sized
- * allocations so that the various electric fence heaps works correctly.
- *
- * @returns See RTMemAlloc.
- * @param   cbUnaligned         The unaligned size.
- */
-RTDECL(void *) RTMemAllocVar(size_t cbUnaligned)
-{
-    size_t cbAligned;
-    if (cbUnaligned >= 16)
-        cbAligned = RT_ALIGN_Z(cbUnaligned, 16);
-    else
-        cbAligned = RT_ALIGN_Z(cbUnaligned, sizeof(void *));
-    return RTMemAlloc(cbAligned);
-}
-
-
-/**
- * Wrapper around RTMemAllocZ for automatically aligning variable sized
- * allocations so that the various electric fence heaps works correctly.
- *
- * @returns See RTMemAllocZ.
- * @param   cbUnaligned         The unaligned size.
- */
-RTDECL(void *) RTMemAllocZVar(size_t cbUnaligned)
-{
-    size_t cbAligned;
-    if (cbUnaligned >= 16)
-        cbAligned = RT_ALIGN_Z(cbUnaligned, 16);
-    else
-        cbAligned = RT_ALIGN_Z(cbUnaligned, sizeof(void *));
-    return RTMemAllocZ(cbAligned);
-}