jdk-sandbox: comparison hotspot/src/share/vm/memory/universe.cpp

equal deleted inserted replaced

-:7425be18f6f4
+:0ad35be0733a
 NarrowPtrStruct Universe::_narrow_oop = { NULL, 0, true };
 NarrowPtrStruct Universe::_narrow_klass = { NULL, 0, true };
 address Universe::_narrow_ptrs_base;
-size_t          Universe::_class_metaspace_size;
 void Universe::basic_type_classes_do(void f(Klass*)) {
 f(boolArrayKlassObj());
 f(byteArrayKlassObj());
 f(charArrayKlassObj());
 f(intArrayKlassObj());
 jint status = Universe::initialize_heap();
 if (status != JNI_OK) {
 return status;
 }
+Metaspace::global_initialize();
 // Create memory for metadata.  Must be after initializing heap for
 // DumpSharedSpaces.
 ClassLoaderData::init_null_class_loader_data();
 // We have a heap so create the Method* caches before
 const size_t total_size = heap_size + HeapBaseMinAddress;
 // Return specified base for the first request.
 if (!FLAG_IS_DEFAULT(HeapBaseMinAddress) && (mode == UnscaledNarrowOop)) {
 base = HeapBaseMinAddress;
-// If the total size and the metaspace size are small enough to allow
+// If the total size is small enough to allow UnscaledNarrowOop then
-// UnscaledNarrowOop then just use UnscaledNarrowOop.
+// just use UnscaledNarrowOop.
-} else if ((total_size <= OopEncodingHeapMax) && (mode != HeapBasedNarrowOop) &&
+} else if ((total_size <= OopEncodingHeapMax) && (mode != HeapBasedNarrowOop)) {
-(!UseCompressedKlassPointers ||
-(((OopEncodingHeapMax - heap_size) + Universe::class_metaspace_size()) <= KlassEncodingMetaspaceMax))) {
-// We don't need to check the metaspace size here because it is always smaller
-// than total_size.
 if ((total_size <= NarrowOopHeapMax) && (mode == UnscaledNarrowOop) &&
 (Universe::narrow_oop_shift() == 0)) {
 // Use 32-bits oops without encoding and
 // place heap's top on the 4Gb boundary
 base = (NarrowOopHeapMax - heap_size);
 // place heap's top on the 32Gb boundary in case
 // total_size > 4Gb or failed to reserve below 4Gb.
 base = (OopEncodingHeapMax - heap_size);
 }
 }
-// See if ZeroBaseNarrowOop encoding will work for a heap based at
-// (KlassEncodingMetaspaceMax - class_metaspace_size()).
-} else if (UseCompressedKlassPointers && (mode != HeapBasedNarrowOop) &&
-(Universe::class_metaspace_size() + HeapBaseMinAddress <= KlassEncodingMetaspaceMax) &&
-(KlassEncodingMetaspaceMax + heap_size - Universe::class_metaspace_size() <= OopEncodingHeapMax)) {
-base = (KlassEncodingMetaspaceMax - Universe::class_metaspace_size());
 } else {
 // UnscaledNarrowOop encoding didn't work, and no base was found for ZeroBasedOops or
 // HeapBasedNarrowOop encoding was requested.  So, can't reserve below 32Gb.
 Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
 }
 // Set narrow_oop_base and narrow_oop_use_implicit_null_checks
 // used in ReservedHeapSpace() constructors.
 // The final values will be set in initialize_heap() below.
-if ((base != 0) && ((base + heap_size) <= OopEncodingHeapMax) &&
+if ((base != 0) && ((base + heap_size) <= OopEncodingHeapMax)) {
-(!UseCompressedKlassPointers || (base + Universe::class_metaspace_size()) <= KlassEncodingMetaspaceMax)) {
 // Use zero based compressed oops
 Universe::set_narrow_oop_base(NULL);
 // Don't need guard page for implicit checks in indexed
 // addressing mode with zero based Compressed Oops.
 Universe::set_narrow_oop_use_implicit_null_checks(true);
 if (verbose) {
 tty->cr();
 tty->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB",
 Universe::heap()->base(), Universe::heap()->reserved_region().byte_size()/M);
 }
-if (((uint64_t)Universe::heap()->reserved_region().end() > OopEncodingHeapMax) ||
+if (((uint64_t)Universe::heap()->reserved_region().end() > OopEncodingHeapMax)) {
-(UseCompressedKlassPointers &&
-((uint64_t)Universe::heap()->base() + Universe::class_metaspace_size() > KlassEncodingMetaspaceMax))) {
 // Can't reserve heap below 32Gb.
 // keep the Universe::narrow_oop_base() set in Universe::reserve_heap()
 Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
 if (verbose) {
 tty->print(", %s: "PTR_FORMAT,
 if (verbose) {
 tty->print(", %s", narrow_oop_mode_to_string(UnscaledNarrowOop));
 }
 }
 }
 if (verbose) {
 tty->cr();
 tty->cr();
 }
-if (UseCompressedKlassPointers) {
-Universe::set_narrow_klass_base(Universe::narrow_oop_base());
-Universe::set_narrow_klass_shift(MIN2(Universe::narrow_oop_shift(), LogKlassAlignmentInBytes));
-}
 Universe::set_narrow_ptrs_base(Universe::narrow_oop_base());
 }
-// Universe::narrow_oop_base() is one page below the metaspace
+// Universe::narrow_oop_base() is one page below the heap.
-// base. The actual metaspace base depends on alignment constraints
+assert((intptr_t)Universe::narrow_oop_base() <= (intptr_t)(Universe::heap()->base() -
-// so we don't know its exact location here.
+os::vm_page_size()) ||
-assert((intptr_t)Universe::narrow_oop_base() <= (intptr_t)(Universe::heap()->base() - os::vm_page_size() - ClassMetaspaceSize) ||
 Universe::narrow_oop_base() == NULL, "invalid value");
 assert(Universe::narrow_oop_shift() == LogMinObjAlignmentInBytes ||
 Universe::narrow_oop_shift() == 0, "invalid value");
 #endif
 }
 // Reserve the Java heap, which is now the same for all GCs.
 ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
-// Add in the class metaspace area so the classes in the headers can
+size_t total_reserved = align_size_up(heap_size, alignment);
-// be compressed the same as instances.
-// Need to round class space size up because it's below the heap and
-// the actual alignment depends on its size.
-Universe::set_class_metaspace_size(align_size_up(ClassMetaspaceSize, alignment));
-size_t total_reserved = align_size_up(heap_size + Universe::class_metaspace_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);
 ReservedHeapSpace total_rs(total_reserved, alignment, UseLargePages, addr);
 if (!total_rs.is_reserved()) {
 vm_exit_during_initialization(err_msg("Could not reserve enough space for " SIZE_FORMAT "KB object heap", total_reserved/K));
 return total_rs;
 }
-// Split the reserved space into main Java heap and a space for
-// classes so that they can be compressed using the same algorithm
-// as compressed oops. If compress oops and compress klass ptrs are
-// used we need the meta space first: if the alignment used for
-// compressed oops is greater than the one used for compressed klass
-// ptrs, a metadata space on top of the heap could become
-// unreachable.
-ReservedSpace class_rs = total_rs.first_part(Universe::class_metaspace_size());
-ReservedSpace heap_rs = total_rs.last_part(Universe::class_metaspace_size(), alignment);
-Metaspace::initialize_class_space(class_rs);
 if (UseCompressedOops) {
 // Universe::initialize_heap() will reset this to NULL if unscaled
 // or zero-based narrow oops are actually used.
 address base = (address)(total_rs.base() - os::vm_page_size());
 Universe::set_narrow_oop_base(base);
 }
-return heap_rs;
+return total_rs;
 }
-// It's the caller's repsonsibility to ensure glitch-freedom
+// It's the caller's responsibility to ensure glitch-freedom
 // (if required).
 void Universe::update_heap_info_at_gc() {
 _heap_capacity_at_last_gc = heap()->capacity();
 _heap_used_at_last_gc     = heap()->used();
 }

changeset 19319	0ad35be0733a
parent 19278	c4355bebb414
child 19322	e35f9ed4f081