src/hotspot/share/gc/g1/g1CollectedHeap.cpp

rev 49171 : imported patch 8185034-metaspace-cleanup-1-rename-metaspaceaux

*** 1072,1082 ****
  }
  
  void G1CollectedHeap::prepare_heap_for_mutators() {
    // Delete metaspaces for unloaded class loaders and clean up loader_data graph
    ClassLoaderDataGraph::purge();
!   MetaspaceAux::verify_metrics();
  
    // Prepare heap for normal collections.
    assert(num_free_regions() == 0, "we should not have added any free regions");
    rebuild_region_sets(false /* free_list_only */);
    abort_refinement();
--- 1072,1082 ----
  }
  
  void G1CollectedHeap::prepare_heap_for_mutators() {
    // Delete metaspaces for unloaded class loaders and clean up loader_data graph
    ClassLoaderDataGraph::purge();
!   MetaspaceUtils::verify_metrics();
  
    // Prepare heap for normal collections.
    assert(num_free_regions() == 0, "we should not have added any free regions");
    rebuild_region_sets(false /* free_list_only */);
    abort_refinement();
*** 2343,2353 ****
              (size_t) young_regions * HeapRegion::GrainBytes / K);
    uint survivor_regions = survivor_regions_count();
    st->print("%u survivors (" SIZE_FORMAT "K)", survivor_regions,
              (size_t) survivor_regions * HeapRegion::GrainBytes / K);
    st->cr();
!   MetaspaceAux::print_on(st);
  }
  
  void G1CollectedHeap::print_regions_on(outputStream* st) const {
    st->print_cr("Heap Regions: E=young(eden), S=young(survivor), O=old, "
                 "HS=humongous(starts), HC=humongous(continues), "
--- 2343,2353 ----
              (size_t) young_regions * HeapRegion::GrainBytes / K);
    uint survivor_regions = survivor_regions_count();
    st->print("%u survivors (" SIZE_FORMAT "K)", survivor_regions,
              (size_t) survivor_regions * HeapRegion::GrainBytes / K);
    st->cr();
!   MetaspaceUtils::print_on(st);
  }
  
  void G1CollectedHeap::print_regions_on(outputStream* st) const {
    st->print_cr("Heap Regions: E=young(eden), S=young(survivor), O=old, "
                 "HS=humongous(starts), HC=humongous(continues), "