Mercurial > hg > truffle

comparison src/share/vm/memory/universe.cpp @ 17891:b6a2ba7d3ea7 hs25.20-b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Thu, 17 Apr 2014 16:09:07 -0700
parents 9c3dc501b5eb
children 78bbf4d43a14
comparison
equal deleted inserted replaced
17862:70dc2c030c69 17891:b6a2ba7d3ea7
630 "LogHeapWordSize is incorrect."); 630 "LogHeapWordSize is incorrect.");
631 guarantee(sizeof(oop) >= sizeof(HeapWord), "HeapWord larger than oop?"); 631 guarantee(sizeof(oop) >= sizeof(HeapWord), "HeapWord larger than oop?");
632 guarantee(sizeof(oop) % sizeof(HeapWord) == 0, 632 guarantee(sizeof(oop) % sizeof(HeapWord) == 0,
633 "oop size is not not a multiple of HeapWord size"); 633 "oop size is not not a multiple of HeapWord size");
634 TraceTime timer("Genesis", TraceStartupTime); 634 TraceTime timer("Genesis", TraceStartupTime);
635 GC_locker::lock(); // do not allow gc during bootstrapping
636 JavaClasses::compute_hard_coded_offsets(); 635 JavaClasses::compute_hard_coded_offsets();
637 636
638 jint status = Universe::initialize_heap(); 637 jint status = Universe::initialize_heap();
639 if (status != JNI_OK) { 638 if (status != JNI_OK) {
640 return status; 639 return status;
1162 MetaspaceCounters::initialize_performance_counters(); 1161 MetaspaceCounters::initialize_performance_counters();
1163 CompressedClassSpaceCounters::initialize_performance_counters(); 1162 CompressedClassSpaceCounters::initialize_performance_counters();
1164 1163
1165 MemoryService::add_metaspace_memory_pools(); 1164 MemoryService::add_metaspace_memory_pools();
1166 1165
1167 GC_locker::unlock(); // allow gc after bootstrapping
1168
1169 MemoryService::set_universe_heap(Universe::_collectedHeap); 1166 MemoryService::set_universe_heap(Universe::_collectedHeap);
1170 return true; 1167 return true;
1171 } 1168 }
1172 1169
1173 1170