comparison src/share/vm/services/memoryService.cpp @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents d2a62e0f25eb
children da91efe96a93
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
56 #include "services/g1MemoryPool.hpp" 56 #include "services/g1MemoryPool.hpp"
57 #include "services/psMemoryPool.hpp" 57 #include "services/psMemoryPool.hpp"
58 #endif 58 #endif
59 59
60 GrowableArray<MemoryPool*>* MemoryService::_pools_list = 60 GrowableArray<MemoryPool*>* MemoryService::_pools_list =
61 new (ResourceObj::C_HEAP) GrowableArray<MemoryPool*>(init_pools_list_size, true); 61 new (ResourceObj::C_HEAP, mtInternal) GrowableArray<MemoryPool*>(init_pools_list_size, true);
62 GrowableArray<MemoryManager*>* MemoryService::_managers_list = 62 GrowableArray<MemoryManager*>* MemoryService::_managers_list =
63 new (ResourceObj::C_HEAP) GrowableArray<MemoryManager*>(init_managers_list_size, true); 63 new (ResourceObj::C_HEAP, mtInternal) GrowableArray<MemoryManager*>(init_managers_list_size, true);
64 64
65 GCMemoryManager* MemoryService::_minor_gc_manager = NULL; 65 GCMemoryManager* MemoryService::_minor_gc_manager = NULL;
66 GCMemoryManager* MemoryService::_major_gc_manager = NULL; 66 GCMemoryManager* MemoryService::_major_gc_manager = NULL;
67 MemoryPool* MemoryService::_code_heap_pool = NULL; 67 MemoryPool* MemoryService::_code_heap_pool = NULL;
68 68