8259009: G1 heap summary should be shown in "Heap Parameters" window on HSDB

Reviewed-by: cjplummer, tschatzl

Author: YaSuenag

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, 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
@@ -156,7 +156,7 @@ public void printOn(PrintStream tty) {
         tty.println(" region size " + (HeapRegion.grainBytes() / 1024) + "K");
 
         HeapSummary sum = new HeapSummary();
-        sum.printG1HeapSummary(this);
+        sum.printG1HeapSummary(tty, this);
     }
 
     public void printRegionDetails(PrintStream tty) {

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, 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
@@ -24,6 +24,7 @@
 
 package sun.jvm.hotspot.tools;
 
+import java.io.*;
 import java.util.*;
 import sun.jvm.hotspot.gc.epsilon.*;
 import sun.jvm.hotspot.gc.g1.*;
@@ -239,48 +240,60 @@ private void printSpace(ContiguousSpace space) {
    }
 
    public void printG1HeapSummary(G1CollectedHeap g1h) {
+      printG1HeapSummary(System.out, g1h);
+   }
+
+   public void printG1HeapSummary(PrintStream tty, G1CollectedHeap g1h) {
       G1MonitoringSupport g1mm = g1h.g1mm();
       long edenSpaceRegionNum = g1mm.edenSpaceRegionNum();
       long survivorSpaceRegionNum = g1mm.survivorSpaceRegionNum();
       HeapRegionSetBase oldSet = g1h.oldSet();
       HeapRegionSetBase archiveSet = g1h.archiveSet();
       HeapRegionSetBase humongousSet = g1h.humongousSet();
       long oldGenRegionNum = oldSet.length() + archiveSet.length() + humongousSet.length();
-      printG1Space("G1 Heap:", g1h.n_regions(),
+      printG1Space(tty, "G1 Heap:", g1h.n_regions(),
                    g1h.used(), g1h.capacity());
-      System.out.println("G1 Young Generation:");
-      printG1Space("Eden Space:", edenSpaceRegionNum,
+      tty.println("G1 Young Generation:");
+      printG1Space(tty, "Eden Space:", edenSpaceRegionNum,
                    g1mm.edenSpaceUsed(), g1mm.edenSpaceCommitted());
-      printG1Space("Survivor Space:", survivorSpaceRegionNum,
+      printG1Space(tty, "Survivor Space:", survivorSpaceRegionNum,
                    g1mm.survivorSpaceUsed(), g1mm.survivorSpaceCommitted());
-      printG1Space("G1 Old Generation:", oldGenRegionNum,
+      printG1Space(tty, "G1 Old Generation:", oldGenRegionNum,
                    g1mm.oldGenUsed(), g1mm.oldGenCommitted());
    }
 
-   private void printG1Space(String spaceName, long regionNum,
+   private void printG1Space(PrintStream tty, String spaceName, long regionNum,
                              long used, long capacity) {
       long free = capacity - used;
-      System.out.println(spaceName);
-      printValue("regions  = ", regionNum);
-      printValMB("capacity = ", capacity);
-      printValMB("used     = ", used);
-      printValMB("free     = ", free);
+      tty.println(spaceName);
+      printValue(tty, "regions  = ", regionNum);
+      printValMB(tty, "capacity = ", capacity);
+      printValMB(tty, "used     = ", used);
+      printValMB(tty, "free     = ", free);
       double occPerc = (capacity > 0) ? (double) used * 100.0 / capacity : 0.0;
-      System.out.println(alignment + occPerc + "% used");
+      tty.println(alignment + occPerc + "% used");
    }
 
-   private static final double FACTOR = 1024*1024;
    private void printValMB(String title, long value) {
+      printValMB(System.out, title, value);
+   }
+
+   private static final double FACTOR = 1024*1024;
+   private void printValMB(PrintStream tty, String title, long value) {
       if (value < 0) {
-        System.out.println(alignment + title +   (value >>> 20)  + " MB");
+        tty.println(alignment + title +   (value >>> 20)  + " MB");
       } else {
         double mb = value/FACTOR;
-        System.out.println(alignment + title + value + " (" + mb + "MB)");
+        tty.println(alignment + title + value + " (" + mb + "MB)");
       }
    }
 
    private void printValue(String title, long value) {
-      System.out.println(alignment + title + value);
+      printValue(System.out, title, value);
+   }
+
+   private void printValue(PrintStream tty, String title, long value) {
+      tty.println(alignment + title + value);
    }
 
    private long getFlagValue(String name, Map flagMap) {