truffle: src/share/vm/memory/allocation.hpp comparison

comparison src/share/vm/memory/allocation.hpp @ 11017:ce9ecec70f99

Merge

author	chegar
date	Thu, 23 May 2013 12:44:18 +0100
parents	7ee0d5c53c78 f9be75d21404
children	eaf3742822ec

comparison

equal deleted inserted replaced

-:cb92413c6934
+:ce9ecec70f99
 // member functions for printing. Classes that avoid allocating the
 // vtbl entries in the objects should therefore not be the printable
 // subclasses.
 //
 // The following macros and function should be used to allocate memory
-// directly in the resource area or in the C-heap:
+// directly in the resource area or in the C-heap, The _OBJ variants
-//
+// of the NEW/FREE_C_HEAP macros are used for alloc/dealloc simple
-//   NEW_RESOURCE_ARRAY(type,size)
+// objects which are not inherited from CHeapObj, note constructor and
+// destructor are not called. The preferable way to allocate objects
+// is using the new operator.
+//
+// WARNING: The array variant must only be used for a homogenous array
+// where all objects are of the exact type specified. If subtypes are
+// stored in the array then must pay attention to calling destructors
+// at needed.
+//
+//   NEW_RESOURCE_ARRAY(type, size)
 //   NEW_RESOURCE_OBJ(type)
-//   NEW_C_HEAP_ARRAY(type,size)
+//   NEW_C_HEAP_ARRAY(type, size)
-//   NEW_C_HEAP_OBJ(type)
+//   NEW_C_HEAP_OBJ(type, memflags)
+//   FREE_C_HEAP_ARRAY(type, old, memflags)
+//   FREE_C_HEAP_OBJ(objname, type, memflags)
 //   char* AllocateHeap(size_t size, const char* name);
 //   void  FreeHeap(void* p);
 //
 // C-heap allocation can be traced using +PrintHeapAllocation.
 // malloc and free should therefore never called directly.
 template <MEMFLAGS F> class CHeapObj ALLOCATION_SUPER_CLASS_SPEC {
 public:
 _NOINLINE_ void* operator new(size_t size, address caller_pc = 0);
 _NOINLINE_ void* operator new (size_t size, const std::nothrow_t&  nothrow_constant,
 address caller_pc = 0);
+_NOINLINE_ void* operator new [](size_t size, address caller_pc = 0);
+_NOINLINE_ void* operator new [](size_t size, const std::nothrow_t&  nothrow_constant,
+address caller_pc = 0);
 void  operator delete(void* p);
+void  operator delete [] (void* p);
 };
 // Base class for objects allocated on the stack only.
 // Calling new or delete will result in fatal error.
 class StackObj ALLOCATION_SUPER_CLASS_SPEC {
 private:
 void* operator new(size_t size);
 void  operator delete(void* p);
+void* operator new [](size_t size);
+void  operator delete [](void* p);
 };
 // Base class for objects used as value objects.
 // Calling new or delete will result in fatal error.
 //
 // be defined as a an empty string "".
 //
 class _ValueObj {
 private:
 void* operator new(size_t size);
-void operator delete(void* p);
+void  operator delete(void* p);
+void* operator new [](size_t size);
+void  operator delete [](void* p);
 };
 // Base class for objects stored in Metaspace.
 // Calling delete will result in fatal error.
 ~ResourceObj();
 #endif // ASSERT
 public:
 void* operator new(size_t size, allocation_type type, MEMFLAGS flags);
+void* operator new [](size_t size, allocation_type type, MEMFLAGS flags);
 void* operator new(size_t size, const std::nothrow_t&  nothrow_constant,
 allocation_type type, MEMFLAGS flags);
+void* operator new [](size_t size, const std::nothrow_t&  nothrow_constant,
+allocation_type type, MEMFLAGS flags);
 void* operator new(size_t size, Arena *arena) {
 address res = (address)arena->Amalloc(size);
 DEBUG_ONLY(set_allocation_type(res, ARENA);)
 return res;
 }
+void* operator new [](size_t size, Arena *arena) {
+address res = (address)arena->Amalloc(size);
+DEBUG_ONLY(set_allocation_type(res, ARENA);)
+return res;
+}
 void* operator new(size_t size) {
 address res = (address)resource_allocate_bytes(size);
 DEBUG_ONLY(set_allocation_type(res, RESOURCE_AREA);)
 return res;
 }
 address res = (address)resource_allocate_bytes(size, AllocFailStrategy::RETURN_NULL);
 DEBUG_ONLY(if (res != NULL) set_allocation_type(res, RESOURCE_AREA);)
 return res;
 }
+void* operator new [](size_t size) {
+address res = (address)resource_allocate_bytes(size);
+DEBUG_ONLY(set_allocation_type(res, RESOURCE_AREA);)
+return res;
+}
+void* operator new [](size_t size, const std::nothrow_t& nothrow_constant) {
+address res = (address)resource_allocate_bytes(size, AllocFailStrategy::RETURN_NULL);
+DEBUG_ONLY(if (res != NULL) set_allocation_type(res, RESOURCE_AREA);)
+return res;
+}
 void  operator delete(void* p);
+void  operator delete [](void* p);
 };
 // One of the following macros must be used when allocating an array
 // or object to determine whether it should reside in the C heap on in
 // the resource area.
 (type*) (AllocateHeap((size) * sizeof(type), memflags))
 #define REALLOC_C_HEAP_ARRAY(type, old, size, memflags)\
 (type*) (ReallocateHeap((char*)old, (size) * sizeof(type), memflags))
-#define FREE_C_HEAP_ARRAY(type,old,memflags) \
+#define FREE_C_HEAP_ARRAY(type, old, memflags) \
 FreeHeap((char*)(old), memflags)
+#define NEW_C_HEAP_ARRAY2(type, size, memflags, pc)\
+(type*) (AllocateHeap((size) * sizeof(type), memflags, pc))
+#define REALLOC_C_HEAP_ARRAY2(type, old, size, memflags, pc)\
+(type*) (ReallocateHeap((char*)old, (size) * sizeof(type), memflags, pc))
+#define NEW_C_HEAP_ARRAY3(type, size, memflags, pc, allocfail)         \
+(type*) AllocateHeap(size * sizeof(type), memflags, pc, allocfail)
+// allocate type in heap without calling ctor
 #define NEW_C_HEAP_OBJ(type, memflags)\
 NEW_C_HEAP_ARRAY(type, 1, memflags)
+// deallocate obj of type in heap without calling dtor
-#define NEW_C_HEAP_ARRAY2(type, size, memflags, pc)\
+#define FREE_C_HEAP_OBJ(objname, memflags)\
-(type*) (AllocateHeap((size) * sizeof(type), memflags, pc))
+FreeHeap((char*)objname, memflags);
-#define REALLOC_C_HEAP_ARRAY2(type, old, size, memflags, pc)\
-(type*) (ReallocateHeap((char*)old, (size) * sizeof(type), memflags, pc))
-#define NEW_C_HEAP_OBJ2(type, memflags, pc)\
-NEW_C_HEAP_ARRAY2(type, 1, memflags, pc)
-extern bool warn_new_operator;
 // for statistics
 #ifndef PRODUCT
 class AllocStats : StackObj {
 julong start_mallocs, start_frees;

Mercurial > hg > truffle

comparison src/share/vm/memory/allocation.hpp @ 11017:ce9ecec70f99