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

rev 51294 : imported patch 8208669-gc-reorder
rev 51295 : imported patch 8208669-gc-reorder-kim-review
rev 51301 : [mq]: 8208498-archive-region-as-region-set
rev 51302 : imported patch 8209061-move-serviceability-to-monitoringsupport
rev 51303 : imported patch 8209062-cleanup-monitoringsupport
rev 51304 : [mq]: 8207200-getmemoryusage-consistency

*** 4973,4982 ****
--- 4973,4986 ----
  
  void G1CollectedHeap::initialize_serviceability() {
    _g1mm->initialize_serviceability();
  }
  
+ MemoryUsage G1CollectedHeap::memory_usage() {
+   return _g1mm->memory_usage();
+ }
+ 
  GrowableArray<GCMemoryManager*> G1CollectedHeap::memory_managers() {
    return _g1mm->memory_managers();
  }
  
  GrowableArray<MemoryPool*> G1CollectedHeap::memory_pools() {