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

equal deleted inserted replaced

-:07d991d45a51
+:17ecb098bc1e
 oop Universe::_system_thread_group                    = NULL;
 objArrayOop Universe::_the_empty_class_klass_array    = NULL;
 Array<Klass*>* Universe::_the_array_interfaces_array = NULL;
 oop Universe::_the_null_string                        = NULL;
 oop Universe::_the_min_jint_string                   = NULL;
-LatestMethodOopCache* Universe::_finalizer_register_cache = NULL;
+LatestMethodCache* Universe::_finalizer_register_cache = NULL;
-LatestMethodOopCache* Universe::_loader_addClass_cache    = NULL;
+LatestMethodCache* Universe::_loader_addClass_cache    = NULL;
-LatestMethodOopCache* Universe::_pd_implies_cache         = NULL;
+LatestMethodCache* Universe::_pd_implies_cache         = NULL;
-ActiveMethodOopsCache* Universe::_reflect_invoke_cache    = NULL;
 oop Universe::_out_of_memory_error_java_heap          = NULL;
 oop Universe::_out_of_memory_error_metaspace          = NULL;
 oop Universe::_out_of_memory_error_class_metaspace    = NULL;
 oop Universe::_out_of_memory_error_array_size         = NULL;
 oop Universe::_out_of_memory_error_gc_overhead_limit  = NULL;
 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());
 f->do_ptr((void**)&_the_empty_short_array);
 f->do_ptr((void**)&_the_empty_method_array);
 f->do_ptr((void**)&_the_empty_klass_array);
 _finalizer_register_cache->serialize(f);
 _loader_addClass_cache->serialize(f);
-_reflect_invoke_cache->serialize(f);
 _pd_implies_cache->serialize(f);
 }
 void Universe::check_alignment(uintx size, uintx alignment, const char* name) {
 if (size < alignment || size % alignment != 0) {
 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
 // Metaspace::initialize_shared_spaces() tries to populate them.
-Universe::_finalizer_register_cache = new LatestMethodOopCache();
+Universe::_finalizer_register_cache = new LatestMethodCache();
-Universe::_loader_addClass_cache    = new LatestMethodOopCache();
+Universe::_loader_addClass_cache    = new LatestMethodCache();
-Universe::_pd_implies_cache         = new LatestMethodOopCache();
+Universe::_pd_implies_cache         = new LatestMethodCache();
-Universe::_reflect_invoke_cache     = new ActiveMethodOopsCache();
 if (UseSharedSpaces) {
 // Read the data structures supporting the shared spaces (shared
 // system dictionary, symbol table, etc.).  After that, access to
 // the file (other than the mapped regions) is no longer needed, and
 // 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 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);
 }
 #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() {
 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);
 #ifdef AIX
 // There is no protected page before the heap. This assures all oops
 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);
+bool use_large_pages = UseLargePages && is_size_aligned(alignment, os::large_page_size());
-ReservedHeapSpace total_rs(total_reserved, alignment, UseLargePages, addr);
+assert(!UseLargePages
+|| UseParallelOldGC
+|| 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;
 }
 }
 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();
 }
 InstanceKlass::cast(SystemDictionary::Finalizer_klass())->link_class(CHECK_false);
 Method* m = InstanceKlass::cast(SystemDictionary::Finalizer_klass())->find_method(
 vmSymbols::register_method_name(),
 vmSymbols::register_method_signature());
 if (m == NULL || !m->is_static()) {
-THROW_MSG_(vmSymbols::java_lang_NoSuchMethodException(),
+tty->print_cr("Unable to link/verify Finalizer.register method");
-"java.lang.ref.Finalizer.register", false);
+return false; // initialization failed (cannot throw exception yet)
 }
 Universe::_finalizer_register_cache->init(
-SystemDictionary::Finalizer_klass(), m, CHECK_false);
+SystemDictionary::Finalizer_klass(), m);
-// Resolve on first use and initialize class.
-// Note: No race-condition here, since a resolve will always return the same result
-// Setup method for security checks
-k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_reflect_Method(), true, CHECK_false);
-k_h = instanceKlassHandle(THREAD, k);
-k_h->link_class(CHECK_false);
-m = k_h->find_method(vmSymbols::invoke_name(), vmSymbols::object_object_array_object_signature());
-if (m == NULL || m->is_static()) {
-THROW_MSG_(vmSymbols::java_lang_NoSuchMethodException(),
-"java.lang.reflect.Method.invoke", false);
-}
-Universe::_reflect_invoke_cache->init(k_h(), m, CHECK_false);
 // Setup method for registering loaded classes in class loader vector
 InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false);
 m = InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
 if (m == NULL || m->is_static()) {
-THROW_MSG_(vmSymbols::java_lang_NoSuchMethodException(),
+tty->print_cr("Unable to link/verify ClassLoader.addClass method");
-"java.lang.ClassLoader.addClass", false);
+return false; // initialization failed (cannot throw exception yet)
 }
 Universe::_loader_addClass_cache->init(
-SystemDictionary::ClassLoader_klass(), m, CHECK_false);
+SystemDictionary::ClassLoader_klass(), m);
 // Setup method for checking protection domain
 InstanceKlass::cast(SystemDictionary::ProtectionDomain_klass())->link_class(CHECK_false);
 m = InstanceKlass::cast(SystemDictionary::ProtectionDomain_klass())->
 find_method(vmSymbols::impliesCreateAccessControlContext_name(),
 // <init> function before java_lang_Class is linked. Print error and exit.
 tty->print_cr("ProtectionDomain.impliesCreateAccessControlContext() has the wrong linkage");
 return false; // initialization failed
 }
 Universe::_pd_implies_cache->init(
-SystemDictionary::ProtectionDomain_klass(), m, CHECK_false);;
+SystemDictionary::ProtectionDomain_klass(), m);;
 }
 // The folowing is initializing converter functions for serialization in
 // JVM.cpp. If we clean up the StrictMath code above we may want to find
 // a better solution for this as well.
 // ("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);
 verify_mark_mask();
 verify_mark_bits();
 }
-void CommonMethodOopCache::init(Klass* k, Method* m, TRAPS) {
+void LatestMethodCache::init(Klass* k, Method* m) {
 if (!UseSharedSpaces) {
 _klass = k;
 }
 #ifndef PRODUCT
 else {
 _method_idnum = m->method_idnum();
 assert(_method_idnum >= 0, "sanity check");
 }
-ActiveMethodOopsCache::~ActiveMethodOopsCache() {
+Method* LatestMethodCache::get_method() {
-if (_prev_methods != NULL) {
-delete _prev_methods;
-_prev_methods = NULL;
-}
-}
-void ActiveMethodOopsCache::add_previous_version(Method* method) {
-assert(Thread::current()->is_VM_thread(),
-"only VMThread can add previous versions");
-// Only append the previous method if it is executing on the stack.
-if (method->on_stack()) {
-if (_prev_methods == NULL) {
-// This is the first previous version so make some space.
-// Start with 2 elements under the assumption that the class
-// won't be redefined much.
-_prev_methods = new (ResourceObj::C_HEAP, mtClass) GrowableArray<Method*>(2, true);
-}
-// RC_TRACE macro has an embedded ResourceMark
-RC_TRACE(0x00000100,
-("add: %s(%s): adding prev version ref for cached method @%d",
-method->name()->as_C_string(), method->signature()->as_C_string(),
-_prev_methods->length()));
-_prev_methods->append(method);
-}
-// Since the caller is the VMThread and we are at a safepoint, this is a good
-// time to clear out unused method references.
-if (_prev_methods == NULL) return;
-for (int i = _prev_methods->length() - 1; i >= 0; i--) {
-Method* method = _prev_methods->at(i);
-assert(method != NULL, "weak method ref was unexpectedly cleared");
-if (!method->on_stack()) {
-// This method isn't running anymore so remove it
-_prev_methods->remove_at(i);
-MetadataFactory::free_metadata(method->method_holder()->class_loader_data(), method);
-} else {
-// RC_TRACE macro has an embedded ResourceMark
-RC_TRACE(0x00000400,
-("add: %s(%s): previous cached method @%d is alive",
-method->name()->as_C_string(), method->signature()->as_C_string(), i));
-}
-}
-} // end add_previous_version()
-bool ActiveMethodOopsCache::is_same_method(const Method* method) const {
-InstanceKlass* ik = InstanceKlass::cast(klass());
-const Method* check_method = ik->method_with_idnum(method_idnum());
-assert(check_method != NULL, "sanity check");
-if (check_method == method) {
-// done with the easy case
-return true;
-}
-if (_prev_methods != NULL) {
-// The cached method has been redefined at least once so search
-// the previous versions for a match.
-for (int i = 0; i < _prev_methods->length(); i++) {
-check_method = _prev_methods->at(i);
-if (check_method == method) {
-// a previous version matches
-return true;
-}
-}
-}
-// either no previous versions or no previous version matched
-return false;
-}
-Method* LatestMethodOopCache::get_Method() {
 if (klass() == NULL) return NULL;
 InstanceKlass* ik = InstanceKlass::cast(klass());
 Method* m = ik->method_with_idnum(method_idnum());
 assert(m != NULL, "sanity check");
 return m;

changeset 22828	17ecb098bc1e
parent 22827	07d991d45a51
parent 19546	f6b7c9e96ea3
child 22838	82c7497fbad4