comparison src/share/vm/memory/universe.cpp @ 11048:2b9380b0bf0b hs25-b39

Merge
author amurillo
date Fri, 28 Jun 2013 02:25:07 -0700
parents 9f3e3245b50f 71963b3f802a
children cedf20e2a655
comparison
equal deleted inserted replaced
11024:b6d1e42655cd 11048:2b9380b0bf0b
1145 // ("weak") refs processing infrastructure initialization 1145 // ("weak") refs processing infrastructure initialization
1146 Universe::heap()->post_initialize(); 1146 Universe::heap()->post_initialize();
1147 1147
1148 // Initialize performance counters for metaspaces 1148 // Initialize performance counters for metaspaces
1149 MetaspaceCounters::initialize_performance_counters(); 1149 MetaspaceCounters::initialize_performance_counters();
1150 MemoryService::add_metaspace_memory_pools();
1150 1151
1151 GC_locker::unlock(); // allow gc after bootstrapping 1152 GC_locker::unlock(); // allow gc after bootstrapping
1152 1153
1153 MemoryService::set_universe_heap(Universe::_collectedHeap); 1154 MemoryService::set_universe_heap(Universe::_collectedHeap);
1154 return true; 1155 return true;