--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	Mon Mar 19 14:20:28 2018 -0500
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	Tue Mar 20 11:24:32 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,22 +111,7 @@
             }
          }
       } else if (heap instanceof G1CollectedHeap) {
-          G1CollectedHeap g1h = (G1CollectedHeap) heap;
-          G1MonitoringSupport g1mm = g1h.g1mm();
-          long edenRegionNum = g1mm.edenRegionNum();
-          long survivorRegionNum = g1mm.survivorRegionNum();
-          HeapRegionSetBase oldSet = g1h.oldSet();
-          HeapRegionSetBase humongousSet = g1h.humongousSet();
-          long oldRegionNum = oldSet.length() + humongousSet.length();
-          printG1Space("G1 Heap:", g1h.n_regions(),
-                       g1h.used(), g1h.capacity());
-          System.out.println("G1 Young Generation:");
-          printG1Space("Eden Space:", edenRegionNum,
-                       g1mm.edenUsed(), g1mm.edenCommitted());
-          printG1Space("Survivor Space:", survivorRegionNum,
-                       g1mm.survivorUsed(), g1mm.survivorCommitted());
-          printG1Space("G1 Old Generation:", oldRegionNum,
-                       g1mm.oldUsed(), g1mm.oldCommitted());
+          printG1HeapSummary((G1CollectedHeap)heap);
       } else if (heap instanceof ParallelScavengeHeap) {
          ParallelScavengeHeap psh = (ParallelScavengeHeap) heap;
          PSYoungGen youngGen = psh.youngGen();
@@ -217,6 +202,24 @@
       System.out.println(alignment +  (double)space.used() * 100.0 / space.capacity() + "% used");
    }
 
+   public void printG1HeapSummary(G1CollectedHeap g1h) {
+      G1MonitoringSupport g1mm = g1h.g1mm();
+      long edenRegionNum = g1mm.edenRegionNum();
+      long survivorRegionNum = g1mm.survivorRegionNum();
+      HeapRegionSetBase oldSet = g1h.oldSet();
+      HeapRegionSetBase humongousSet = g1h.humongousSet();
+      long oldRegionNum = oldSet.length() + humongousSet.length();
+      printG1Space("G1 Heap:", g1h.n_regions(),
+                   g1h.used(), g1h.capacity());
+      System.out.println("G1 Young Generation:");
+      printG1Space("Eden Space:", edenRegionNum,
+                   g1mm.edenUsed(), g1mm.edenCommitted());
+      printG1Space("Survivor Space:", survivorRegionNum,
+                   g1mm.survivorUsed(), g1mm.survivorCommitted());
+      printG1Space("G1 Old Generation:", oldRegionNum,
+                   g1mm.oldUsed(), g1mm.oldCommitted());
+   }
+
    private void printG1Space(String spaceName, long regionNum,
                              long used, long capacity) {
       long free = capacity - used;