Modified: trunk/Source/WTF/wtf/FastAllocBase.h (155220 => 155221)
--- trunk/Source/WTF/wtf/FastAllocBase.h 2013-09-06 22:34:29 UTC (rev 155220)
+++ trunk/Source/WTF/wtf/FastAllocBase.h 2013-09-06 23:04:13 UTC (rev 155221)
@@ -29,61 +29,6 @@
#ifndef FastAllocBase_h
#define FastAllocBase_h
-// Provides customizable overrides of fastMalloc/fastFree and operator new/delete
-//
-// Provided functionality:
-// Macro: WTF_MAKE_FAST_ALLOCATED
-// namespace WTF {
-//
-// T* fastNew<T>();
-// T* fastNew<T>(arg);
-// T* fastNew<T>(arg, arg);
-// T* fastNewArray<T>(count);
-// void fastDelete(T* p);
-// void fastDeleteArray(T* p);
-// void fastNonNullDelete(T* p);
-// void fastNonNullDeleteArray(T* p);
-// }
-//
-// FastDelete assumes that the underlying
-//
-// Example usage:
-// class Widget {
-// WTF_MAKE_FAST_ALLOCATED
-// ...
-// };
-//
-// struct Data {
-// WTF_MAKE_FAST_ALLOCATED
-// public:
-// ...
-// };
-//
-// char* charPtr = fastNew<char>();
-// fastDelete(charPtr);
-//
-// char* charArrayPtr = fastNewArray<char>(37);
-// fastDeleteArray(charArrayPtr);
-//
-// void** voidPtrPtr = fastNew<void*>();
-// fastDelete(voidPtrPtr);
-//
-// void** voidPtrArrayPtr = fastNewArray<void*>(37);
-// fastDeleteArray(voidPtrArrayPtr);
-//
-// POD* podPtr = fastNew<POD>();
-// fastDelete(podPtr);
-//
-// POD* podArrayPtr = fastNewArray<POD>(37);
-// fastDeleteArray(podArrayPtr);
-//
-// Object* objectPtr = fastNew<Object>();
-// fastDelete(objectPtr);
-//
-// Object* objectArrayPtr = fastNewArray<Object>(37);
-// fastDeleteArray(objectArrayPtr);
-//
-
#include <new>
#include <stdint.h>
#include <stdlib.h>
@@ -131,297 +76,5 @@
private: \
typedef int __thisIsHereToForceASemicolonAfterThisMacro
-namespace WTF {
- // fastNew / fastDelete
-
- template <typename T>
- inline T* fastNew()
- {
- void* p = fastMalloc(sizeof(T));
-
- if (!p)
- return 0;
-
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNew);
- return ::new (p) T;
- }
-
- template <typename T, typename Arg1>
- inline T* fastNew(Arg1 arg1)
- {
- void* p = fastMalloc(sizeof(T));
-
- if (!p)
- return 0;
-
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNew);
- return ::new (p) T(arg1);
- }
-
- template <typename T, typename Arg1, typename Arg2>
- inline T* fastNew(Arg1 arg1, Arg2 arg2)
- {
- void* p = fastMalloc(sizeof(T));
-
- if (!p)
- return 0;
-
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNew);
- return ::new (p) T(arg1, arg2);
- }
-
- template <typename T, typename Arg1, typename Arg2, typename Arg3>
- inline T* fastNew(Arg1 arg1, Arg2 arg2, Arg3 arg3)
- {
- void* p = fastMalloc(sizeof(T));
-
- if (!p)
- return 0;
-
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNew);
- return ::new (p) T(arg1, arg2, arg3);
- }
-
- template <typename T, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
- inline T* fastNew(Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4)
- {
- void* p = fastMalloc(sizeof(T));
-
- if (!p)
- return 0;
-
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNew);
- return ::new (p) T(arg1, arg2, arg3, arg4);
- }
-
- template <typename T, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
- inline T* fastNew(Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4, Arg5 arg5)
- {
- void* p = fastMalloc(sizeof(T));
-
- if (!p)
- return 0;
-
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNew);
- return ::new (p) T(arg1, arg2, arg3, arg4, arg5);
- }
-
- namespace Internal {
-
- // We define a union of pointer to an integer and pointer to T.
- // When non-POD arrays are allocated we add a few leading bytes to tell what
- // the size of the array is. We return to the user the pointer to T.
- // The way to think of it is as if we allocate a struct like so:
- // struct Array {
- // AllocAlignmentInteger m_size;
- // T m_T[array count];
- // };
-
- template <typename T>
- union ArraySize {
- AllocAlignmentInteger* size;
- T* t;
- };
-
- // This is a support template for fastNewArray.
- // This handles the case wherein T has a trivial ctor and a trivial dtor.
- template <typename T, bool trivialCtor, bool trivialDtor>
- struct NewArrayImpl {
- static T* fastNewArray(size_t count)
- {
- T* p = static_cast<T*>(fastMalloc(sizeof(T) * count));
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNewArray);
- return p;
- }
- };
-
- // This is a support template for fastNewArray.
- // This handles the case wherein T has a non-trivial ctor and a trivial dtor.
- template <typename T>
- struct NewArrayImpl<T, false, true> {
- static T* fastNewArray(size_t count)
- {
- T* p = static_cast<T*>(fastMalloc(sizeof(T) * count));
-
- if (!p)
- return 0;
-
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNewArray);
-
- for (T* pObject = p, *pObjectEnd = pObject + count; pObject != pObjectEnd; ++pObject)
- ::new (pObject) T;
-
- return p;
- }
- };
-
- // This is a support template for fastNewArray.
- // This handles the case wherein T has a trivial ctor and a non-trivial dtor.
- template <typename T>
- struct NewArrayImpl<T, true, false> {
- static T* fastNewArray(size_t count)
- {
- void* p = fastMalloc(sizeof(AllocAlignmentInteger) + (sizeof(T) * count));
- ArraySize<T> a = { static_cast<AllocAlignmentInteger*>(p) };
-
- if (!p)
- return 0;
-
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNewArray);
- *a.size++ = count;
- // No need to construct the objects in this case.
-
- return a.t;
- }
- };
-
- // This is a support template for fastNewArray.
- // This handles the case wherein T has a non-trivial ctor and a non-trivial dtor.
- template <typename T>
- struct NewArrayImpl<T, false, false> {
- static T* fastNewArray(size_t count)
- {
- void* p = fastMalloc(sizeof(AllocAlignmentInteger) + (sizeof(T) * count));
- ArraySize<T> a = { static_cast<AllocAlignmentInteger*>(p) };
-
- if (!p)
- return 0;
-
- fastMallocMatchValidateMalloc(p, Internal::AllocTypeFastNewArray);
- *a.size++ = count;
-
- for (T* pT = a.t, *pTEnd = pT + count; pT != pTEnd; ++pT)
- ::new (pT) T;
-
- return a.t;
- }
- };
- } // namespace Internal
-
- template <typename T>
- inline T* fastNewArray(size_t count)
- {
- return Internal::NewArrayImpl<T, WTF::HasTrivialConstructor<T>::value, WTF::HasTrivialDestructor<T>::value>::fastNewArray(count);
- }
-
- template <typename T>
- inline void fastDelete(T* p)
- {
- if (!p)
- return;
-
- fastMallocMatchValidateFree(p, Internal::AllocTypeFastNew);
- p->~T();
- fastFree(p);
- }
-
- template <typename T>
- inline void fastDeleteSkippingDestructor(T* p)
- {
- if (!p)
- return;
-
- fastMallocMatchValidateFree(p, Internal::AllocTypeFastNew);
- fastFree(p);
- }
-
- namespace Internal {
- // This is a support template for fastDeleteArray.
- // This handles the case wherein T has a trivial dtor.
- template <typename T, bool trivialDtor>
- struct DeleteArrayImpl {
- static void fastDeleteArray(void* p)
- {
- // No need to destruct the objects in this case.
- // We expect that fastFree checks for null.
- fastMallocMatchValidateFree(p, Internal::AllocTypeFastNewArray);
- fastFree(p);
- }
- };
-
- // This is a support template for fastDeleteArray.
- // This handles the case wherein T has a non-trivial dtor.
- template <typename T>
- struct DeleteArrayImpl<T, false> {
- static void fastDeleteArray(T* p)
- {
- if (!p)
- return;
-
- ArraySize<T> a;
- a.t = p;
- a.size--; // Decrement size pointer
-
- T* pEnd = p + *a.size;
- while (pEnd-- != p)
- pEnd->~T();
-
- fastMallocMatchValidateFree(a.size, Internal::AllocTypeFastNewArray);
- fastFree(a.size);
- }
- };
-
- } // namespace Internal
-
- template <typename T>
- void fastDeleteArray(T* p)
- {
- Internal::DeleteArrayImpl<T, WTF::HasTrivialDestructor<T>::value>::fastDeleteArray(p);
- }
-
-
- template <typename T>
- inline void fastNonNullDelete(T* p)
- {
- fastMallocMatchValidateFree(p, Internal::AllocTypeFastNew);
- p->~T();
- fastFree(p);
- }
-
- namespace Internal {
- // This is a support template for fastDeleteArray.
- // This handles the case wherein T has a trivial dtor.
- template <typename T, bool trivialDtor>
- struct NonNullDeleteArrayImpl {
- static void fastNonNullDeleteArray(void* p)
- {
- fastMallocMatchValidateFree(p, Internal::AllocTypeFastNewArray);
- // No need to destruct the objects in this case.
- fastFree(p);
- }
- };
-
- // This is a support template for fastDeleteArray.
- // This handles the case wherein T has a non-trivial dtor.
- template <typename T>
- struct NonNullDeleteArrayImpl<T, false> {
- static void fastNonNullDeleteArray(T* p)
- {
- ArraySize<T> a;
- a.t = p;
- a.size--;
-
- T* pEnd = p + *a.size;
- while (pEnd-- != p)
- pEnd->~T();
-
- fastMallocMatchValidateFree(a.size, Internal::AllocTypeFastNewArray);
- fastFree(a.size);
- }
- };
-
- } // namespace Internal
-
- template <typename T>
- void fastNonNullDeleteArray(T* p)
- {
- Internal::NonNullDeleteArrayImpl<T, WTF::HasTrivialDestructor<T>::value>::fastNonNullDeleteArray(p);
- }
-
-
-} // namespace WTF
-
-using WTF::fastDeleteSkippingDestructor;
-
#endif // FastAllocBase_h
Modified: trunk/Source/WTF/wtf/FastMalloc.h (155220 => 155221)
--- trunk/Source/WTF/wtf/FastMalloc.h 2013-09-06 22:34:29 UTC (rev 155220)
+++ trunk/Source/WTF/wtf/FastMalloc.h 2013-09-06 23:04:13 UTC (rev 155221)
@@ -99,8 +99,6 @@
AllocTypeMalloc = 0x375d6750, // Encompasses fastMalloc, fastZeroedMalloc, fastCalloc, fastRealloc.
AllocTypeClassNew, // Encompasses class operator new from FastAllocBase.
AllocTypeClassNewArray, // Encompasses class operator new[] from FastAllocBase.
- AllocTypeFastNew, // Encompasses fastNew.
- AllocTypeFastNewArray, // Encompasses fastNewArray.
AllocTypeNew, // Encompasses global operator new.
AllocTypeNewArray // Encompasses global operator new[].
};
