graal-jvmci-8: src/share/vm/memory/metaspace.cpp comparison

comparison src/share/vm/memory/metaspace.cpp @ 17979:e204777ac770

8042933: assert(capacity_until_gc >= committed_bytes) failed Reviewed-by: stefank, jmasa

author	ehelin
date	Fri, 13 Jun 2014 08:44:11 +0200
parents	78bbf4d43a14
children	52b4284cb496 ce8f6bb717c9

comparison

equal deleted inserted replaced

-:ad51f24671c2
+:e204777ac770
 assert_is_size_aligned(v, Metaspace::commit_alignment());
 return (size_t)Atomic::add_ptr(-(intptr_t)v, &_capacity_until_GC);
 }
+void MetaspaceGC::initialize() {
+// Set the high-water mark to MaxMetapaceSize during VM initializaton since
+// we can't do a GC during initialization.
+_capacity_until_GC = MaxMetaspaceSize;
+}
+void MetaspaceGC::post_initialize() {
+// Reset the high-water mark once the VM initialization is done.
+_capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), MetaspaceSize);
+}
 bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
 // Check if the compressed class space is full.
 if (is_class && Metaspace::using_class_space()) {
 size_t class_committed = MetaspaceAux::committed_bytes(Metaspace::ClassType);
 if (class_committed + word_size * BytesPerWord > CompressedClassSpaceSize) {
 return true;
 }
 size_t MetaspaceGC::allowed_expansion() {
 size_t committed_bytes = MetaspaceAux::committed_bytes();
+size_t capacity_until_gc = capacity_until_GC();
+assert(capacity_until_gc >= committed_bytes,
+err_msg("capacity_until_gc: " SIZE_FORMAT " < committed_bytes: " SIZE_FORMAT,
+capacity_until_gc, committed_bytes));
 size_t left_until_max  = MaxMetaspaceSize - committed_bytes;
-// Always grant expansion if we are initiating the JVM,
-// or if the GC_locker is preventing GCs.
-if (!is_init_completed() || GC_locker::is_active_and_needs_gc()) {
-return left_until_max / BytesPerWord;
-}
-size_t capacity_until_gc = capacity_until_GC();
-if (capacity_until_gc <= committed_bytes) {
-return 0;
-}
 size_t left_until_GC = capacity_until_gc - committed_bytes;
 size_t left_to_commit = MIN2(left_until_GC, left_until_max);
 return left_to_commit / BytesPerWord;
 }
 void MetaspaceGC::compute_new_size() {
 assert(_shrink_factor <= 100, "invalid shrink factor");
 uint current_shrink_factor = _shrink_factor;
 _shrink_factor = 0;
-const size_t used_after_gc = MetaspaceAux::capacity_bytes();
+// Using committed_bytes() for used_after_gc is an overestimation, since the
+// chunk free lists are included in committed_bytes() and the memory in an
+// un-fragmented chunk free list is available for future allocations.
+// However, if the chunk free lists becomes fragmented, then the memory may
+// not be available for future allocations and the memory is therefore "in use".
+// Including the chunk free lists in the definition of "in use" is therefore
+// necessary. Not including the chunk free lists can cause capacity_until_GC to
+// shrink below committed_bytes() and this has caused serious bugs in the past.
+const size_t used_after_gc = MetaspaceAux::committed_bytes();
 const size_t capacity_until_GC = MetaspaceGC::capacity_until_GC();
 const double minimum_free_percentage = MinMetaspaceFreeRatio / 100.0;
 const double maximum_used_percentage = 1.0 - minimum_free_percentage;
 CompressedClassSpaceSize = align_size_down_bounded(CompressedClassSpaceSize, _reserve_alignment);
 set_compressed_class_space_size(CompressedClassSpaceSize);
 }
 void Metaspace::global_initialize() {
+MetaspaceGC::initialize();
 // Initialize the alignment for shared spaces.
 int max_alignment = os::vm_page_size();
 size_t cds_total = 0;
 MetaspaceShared::set_max_alignment(max_alignment);
 if (!_space_list->initialization_succeeded()) {
 vm_exit_during_initialization("Unable to setup metadata virtual space list.", NULL);
 }
 }
-MetaspaceGC::initialize();
 _tracer = new MetaspaceTracer();
+}
+void Metaspace::post_initialize() {
+MetaspaceGC::post_initialize();
 }
 Metachunk* Metaspace::get_initialization_chunk(MetadataType mdtype,
 size_t chunk_word_size,
 size_t chunk_bunch) {

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/memory/metaspace.cpp @ 17979:e204777ac770