src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp

rev 57511 : [mq]: metaspace-improvement

*** 66,76 ****
  #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
  #if INCLUDE_JFR
  #include "gc/shenandoah/shenandoahJfrSupport.hpp"
  #endif
  
! #include "memory/metaspace.hpp"
  #include "oops/compressedOops.inline.hpp"
  #include "runtime/globals.hpp"
  #include "runtime/interfaceSupport.inline.hpp"
  #include "runtime/safepointMechanism.hpp"
  #include "runtime/vmThread.hpp"
--- 66,78 ----
  #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
  #if INCLUDE_JFR
  #include "gc/shenandoah/shenandoahJfrSupport.hpp"
  #endif
  
! 
! #include "memory/metaspace/classLoaderMetaspace.hpp"
! #include "memory/metaspace/metaspaceEnums.hpp"
  #include "oops/compressedOops.inline.hpp"
  #include "runtime/globals.hpp"
  #include "runtime/interfaceSupport.inline.hpp"
  #include "runtime/safepointMechanism.hpp"
  #include "runtime/vmThread.hpp"
*** 871,881 ****
    return allocate_memory(req);
  }
  
  MetaWord* ShenandoahHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loader_data,
                                                               size_t size,
!                                                              Metaspace::MetadataType mdtype) {
    MetaWord* result;
  
    // Inform metaspace OOM to GC heuristics if class unloading is possible.
    if (heuristics()->can_unload_classes()) {
      ShenandoahHeuristics* h = heuristics();
--- 873,883 ----
    return allocate_memory(req);
  }
  
  MetaWord* ShenandoahHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loader_data,
                                                               size_t size,
!                                                              metaspace::MetadataType mdtype) {
    MetaWord* result;
  
    // Inform metaspace OOM to GC heuristics if class unloading is possible.
    if (heuristics()->can_unload_classes()) {
      ShenandoahHeuristics* h = heuristics();
*** 1978,1988 ****
                              ShenandoahPhaseTimings::purge_cldg);
      ClassLoaderDataGraph::purge();
    }
    // Resize and verify metaspace
    MetaspaceGC::compute_new_size();
-   MetaspaceUtils::verify_metrics();
  }
  
  // Process leftover weak oops: update them, if needed or assert they do not
  // need updating otherwise.
  // Weak processor API requires us to visit the oops, even if we are not doing
--- 1980,1989 ----