src/hotspot/share/gc/shared/collectedHeap.cpp

rev 57511 : [mq]: metaspace-improvement

*** 35,44 ****
--- 35,45 ----
  #include "gc/shared/gcVMOperations.hpp"
  #include "gc/shared/gcWhen.hpp"
  #include "gc/shared/memAllocator.hpp"
  #include "logging/log.hpp"
  #include "memory/metaspace.hpp"
+ #include "memory/metaspace/classLoaderMetaspace.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "oops/instanceMirrorKlass.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/handles.inline.hpp"
*** 103,124 ****
    const MetaspaceSizes meta_space(
        MetaspaceUtils::committed_bytes(),
        MetaspaceUtils::used_bytes(),
        MetaspaceUtils::reserved_bytes());
    const MetaspaceSizes data_space(
!       MetaspaceUtils::committed_bytes(Metaspace::NonClassType),
!       MetaspaceUtils::used_bytes(Metaspace::NonClassType),
!       MetaspaceUtils::reserved_bytes(Metaspace::NonClassType));
    const MetaspaceSizes class_space(
!       MetaspaceUtils::committed_bytes(Metaspace::ClassType),
!       MetaspaceUtils::used_bytes(Metaspace::ClassType),
!       MetaspaceUtils::reserved_bytes(Metaspace::ClassType));
  
    const MetaspaceChunkFreeListSummary& ms_chunk_free_list_summary =
!     MetaspaceUtils::chunk_free_list_summary(Metaspace::NonClassType);
    const MetaspaceChunkFreeListSummary& class_chunk_free_list_summary =
!     MetaspaceUtils::chunk_free_list_summary(Metaspace::ClassType);
  
    return MetaspaceSummary(MetaspaceGC::capacity_until_GC(), meta_space, data_space, class_space,
                            ms_chunk_free_list_summary, class_chunk_free_list_summary);
  }
  
--- 104,125 ----
    const MetaspaceSizes meta_space(
        MetaspaceUtils::committed_bytes(),
        MetaspaceUtils::used_bytes(),
        MetaspaceUtils::reserved_bytes());
    const MetaspaceSizes data_space(
!       MetaspaceUtils::committed_bytes(metaspace::NonClassType),
!       MetaspaceUtils::used_bytes(metaspace::NonClassType),
!       MetaspaceUtils::reserved_bytes(metaspace::NonClassType));
    const MetaspaceSizes class_space(
!       MetaspaceUtils::committed_bytes(metaspace::ClassType),
!       MetaspaceUtils::used_bytes(metaspace::ClassType),
!       MetaspaceUtils::reserved_bytes(metaspace::ClassType));
  
    const MetaspaceChunkFreeListSummary& ms_chunk_free_list_summary =
!     MetaspaceUtils::chunk_free_list_summary(metaspace::NonClassType);
    const MetaspaceChunkFreeListSummary& class_chunk_free_list_summary =
!     MetaspaceUtils::chunk_free_list_summary(metaspace::ClassType);
  
    return MetaspaceSummary(MetaspaceGC::capacity_until_GC(), meta_space, data_space, class_space,
                            ms_chunk_free_list_summary, class_chunk_free_list_summary);
  }
  
*** 253,263 ****
    }
  }
  
  MetaWord* CollectedHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loader_data,
                                                              size_t word_size,
!                                                             Metaspace::MetadataType mdtype) {
    uint loop_count = 0;
    uint gc_count = 0;
    uint full_gc_count = 0;
  
    assert(!Heap_lock->owned_by_self(), "Should not be holding the Heap_lock");
--- 254,264 ----
    }
  }
  
  MetaWord* CollectedHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loader_data,
                                                              size_t word_size,
!                                                             metaspace::MetadataType mdtype) {
    uint loop_count = 0;
    uint gc_count = 0;
    uint full_gc_count = 0;
  
    assert(!Heap_lock->owned_by_self(), "Should not be holding the Heap_lock");