truffle: src/share/vm/memory/universe.cpp comparison

comparison src/share/vm/memory/universe.cpp @ 12355:cefad50507d8

Merge with hs25-b53

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Fri, 11 Oct 2013 10:38:03 +0200
parents	58fc8e2b7b6d da051ce490eb
children	096c224171c4

comparison

equal deleted inserted replaced

-:ccb4f2af2319
+:cefad50507d8
 java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(exc);
 return exc;
 }
 }
-static intptr_t non_oop_bits = 0;
+intptr_t Universe::_non_oop_bits = 0;
 void* Universe::non_oop_word() {
 // Neither the high bits nor the low bits of this value is allowed
 // to look like (respectively) the high or low bits of a real oop.
 //
 // word will never look like that of a real oop.
 //
 // Using the OS-supplied non-memory-address word (usually 0 or -1)
 // will take care of the high bits, however many there are.
-if (non_oop_bits == 0) {
+if (_non_oop_bits == 0) {
-non_oop_bits = (intptr_t)os::non_memory_address_word() | 1;
+_non_oop_bits = (intptr_t)os::non_memory_address_word() | 1;
 }
-return (void*)non_oop_bits;
+return (void*)_non_oop_bits;
 }
 jint universe_init() {
 assert(!Universe::_fully_initialized, "called after initialize_vtables");
 guarantee(1 << LogHeapWordSize == sizeof(HeapWord),
 // 4Gb
 static const uint64_t NarrowOopHeapMax = (uint64_t(max_juint) + 1);
 // 32Gb
 // OopEncodingHeapMax == NarrowOopHeapMax << LogMinObjAlignmentInBytes;
-char* Universe::preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode) {
+char* Universe::preferred_heap_base(size_t heap_size, size_t alignment, NARROW_OOP_MODE mode) {
+assert(is_size_aligned((size_t)OopEncodingHeapMax, alignment), "Must be");
+assert(is_size_aligned((size_t)NarrowOopHeapMax, alignment), "Must be");
+assert(is_size_aligned(heap_size, alignment), "Must be");
+uintx heap_base_min_address_aligned = align_size_up(HeapBaseMinAddress, alignment);
 size_t base = 0;
 #ifdef _LP64
 if (UseCompressedOops) {
 assert(mode == UnscaledNarrowOop  ||
 mode == ZeroBasedNarrowOop ||
 mode == HeapBasedNarrowOop, "mode is invalid");
-const size_t total_size = heap_size + HeapBaseMinAddress;
+const size_t total_size = heap_size + heap_base_min_address_aligned;
 // Return specified base for the first request.
 if (!FLAG_IS_DEFAULT(HeapBaseMinAddress) && (mode == UnscaledNarrowOop)) {
-base = HeapBaseMinAddress;
+base = heap_base_min_address_aligned;
 // If the total size is small enough to allow UnscaledNarrowOop then
 // just use UnscaledNarrowOop.
 } else if ((total_size <= OopEncodingHeapMax) && (mode != HeapBasedNarrowOop)) {
 if ((total_size <= NarrowOopHeapMax) && (mode == UnscaledNarrowOop) &&
 }
 #endif //  _WIN64
 }
 }
 #endif
+assert(is_ptr_aligned((char*)base, alignment), "Must be");
 return (char*)base; // also return NULL (don't care) for 32-bit VM
 }
 jint Universe::initialize_heap() {
 }
 // Reserve the Java heap, which is now the same for all GCs.
 ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
+assert(alignment <= Arguments::conservative_max_heap_alignment(),
+err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT,
+alignment, Arguments::conservative_max_heap_alignment()));
 size_t total_reserved = align_size_up(heap_size, alignment);
 assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
 "heap size is too big for compressed oops");
-char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
+bool use_large_pages = UseLargePages && is_size_aligned(alignment, os::large_page_size());
-ReservedHeapSpace total_rs(total_reserved, alignment, UseLargePages, addr);
+assert(!UseLargePages
+|| UseParallelGC
+|| use_large_pages, "Wrong alignment to use large pages");
+char* addr = Universe::preferred_heap_base(total_reserved, alignment, Universe::UnscaledNarrowOop);
+ReservedHeapSpace total_rs(total_reserved, alignment, use_large_pages, addr);
 if (UseCompressedOops) {
 if (addr != NULL && !total_rs.is_reserved()) {
 // Failed to reserve at specified address - the requested memory
 // region is taken already, for example, by 'java' launcher.
 // Try again to reserver heap higher.
-addr = Universe::preferred_heap_base(total_reserved, Universe::ZeroBasedNarrowOop);
+addr = Universe::preferred_heap_base(total_reserved, alignment, Universe::ZeroBasedNarrowOop);
 ReservedHeapSpace total_rs0(total_reserved, alignment,
-UseLargePages, addr);
+use_large_pages, addr);
 if (addr != NULL && !total_rs0.is_reserved()) {
 // Failed to reserve at specified address again - give up.
-addr = Universe::preferred_heap_base(total_reserved, Universe::HeapBasedNarrowOop);
+addr = Universe::preferred_heap_base(total_reserved, alignment, Universe::HeapBasedNarrowOop);
 assert(addr == NULL, "");
 ReservedHeapSpace total_rs1(total_reserved, alignment,
-UseLargePages, addr);
+use_large_pages, addr);
 total_rs = total_rs1;
 } else {
 total_rs = total_rs0;
 }
 }
 Handle msg = java_lang_String::create_from_str("Java heap space", CHECK_false);
 java_lang_Throwable::set_message(Universe::_out_of_memory_error_java_heap, msg());
 msg = java_lang_String::create_from_str("Metadata space", CHECK_false);
 java_lang_Throwable::set_message(Universe::_out_of_memory_error_metaspace, msg());
-msg = java_lang_String::create_from_str("Class Metadata space", CHECK_false);
+msg = java_lang_String::create_from_str("Compressed class space", CHECK_false);
 java_lang_Throwable::set_message(Universe::_out_of_memory_error_class_metaspace, msg());
 msg = java_lang_String::create_from_str("Requested array size exceeds VM limit", CHECK_false);
 java_lang_Throwable::set_message(Universe::_out_of_memory_error_array_size, msg());
 // ("weak") refs processing infrastructure initialization
 Universe::heap()->post_initialize();
 // Initialize performance counters for metaspaces
 MetaspaceCounters::initialize_performance_counters();
+CompressedClassSpaceCounters::initialize_performance_counters();
 MemoryService::add_metaspace_memory_pools();
 GC_locker::unlock();  // allow gc after bootstrapping
 MemoryService::set_universe_heap(Universe::_collectedHeap);

Mercurial > hg > truffle

comparison src/share/vm/memory/universe.cpp @ 12355:cefad50507d8