src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -253,12 +253,28 @@
     width 8
     scale sec
     format "0.000"
   }
   column {
+    header "^CGC^"      /* Concurrent Collections (STW phase) */
+    data sun.gc.collector.2.invocations
+    align center
+    width 5
+    scale raw
+    format "0"
+  }
+  column {
+    header "^CGCT^"     /* Concurrent Garbage Collection Time (STW phase) */
+    data sun.gc.collector.2.time/sun.os.hrt.frequency
+    align right
+    width 8
+    scale sec
+    format "0.000"
+  }
+  column {
     header "^GCT^"      /* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
     format "0.000"
   }

@@ -406,10 +422,18 @@
     align right
     width 5
     scale raw
     format "0"
   }
+  column {
+    header "^CGC^"      /* Concurrent Collections (STW phase) */
+    data sun.gc.collector.2.invocations
+    align right
+    width 5
+    scale raw
+    format "0"
+  }
 }
 
 option gccause {
   column {
     header "^S0^"       /* Survivor 0 Space - Percent Used */

@@ -489,12 +513,28 @@
     scale sec
     width 8
     format "0.000"
   }
   column {
+    header "^CGC^"      /* Concurrent Collections (STW phase) */
+    data sun.gc.collector.2.invocations
+    align right
+    width 5
+    scale raw
+    format "0"
+  }
+  column {
+    header "^CGCT^"     /* Concurrent Garbage Collection Time (STW phase) */
+    data sun.gc.collector.2.time/sun.os.hrt.frequency
+    align right
+    width 8
+    scale sec
+    format "0.000"
+  }
+  column {
     header "^GCT^"      /* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
     format "0.000"
   }

@@ -688,10 +728,18 @@
     align right
     width 5
     scale raw
     format "0"
   }
+  column {
+    header "^CGC^"      /* Concurrent Collections (STW phase) */
+    data sun.gc.collector.2.invocations
+    align right
+    width 5
+    scale raw
+    format "0"
+  }
 }
 
 option gcold {
   column {
     header "^MC^"       /* Metaspace Capacity - Current */

@@ -763,12 +811,28 @@
     scale sec
     width 8
     format "0.000"
   }
   column {
+    header "^CGC^"      /* Concurrent Collections (STW phase) */
+    data sun.gc.collector.2.invocations
+    align right
+    width 5
+    scale raw
+    format "0"
+  }
+  column {
+    header "^CGCT^"     /* Concurrent Garbage Collection Time (STW phase) */
+    data sun.gc.collector.2.time/sun.os.hrt.frequency
+    align right
+    width 8
+    scale sec
+    format "0.000"
+  }
+  column {
     header "^GCT^"      /* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
     format "0.000"
   }

@@ -829,12 +893,28 @@
     scale sec
     width 8
     format "0.000"
   }
   column {
+    header "^CGC^"      /* Concurrent Collections (STW phase) */
+    data sun.gc.collector.2.invocations
+    align right
+    width 5
+    scale raw
+    format "0"
+  }
+  column {
+    header "^CGCT^"     /* Concurrent Garbage Collection Time (STW phase) */
+    data sun.gc.collector.2.time/sun.os.hrt.frequency
+    align right
+    width 8
+    scale sec
+    format "0.000"
+  }
+  column {
     header "^GCT^"      /* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
     format "0.000"
   }

@@ -911,12 +991,28 @@
     scale sec
     width 8
     format "0.000"
   }
   column {
+    header "^CGC^"      /* Concurrent Collections (STW phase) */
+    data sun.gc.collector.2.invocations
+    align right
+    width 5
+    scale raw
+    format "0"
+  }
+  column {
+    header "^CGCT^"     /* Concurrent Garbage Collection Time (STW phase) */
+    data sun.gc.collector.2.time/sun.os.hrt.frequency
+    align right
+    width 8
+    scale sec
+    format "0.000"
+  }
+  column {
     header "^GCT^"      /* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
     format "0.000"
   }

@@ -1001,12 +1097,28 @@
     scale sec
     width 8
     format "0.000"
   }
   column {
+    header "^CGC^"      /* Concurrent Collections (STW phase) */
+    data sun.gc.collector.2.invocations
+    align right
+    width 5
+    scale raw
+    format "0"
+  }
+  column {
+    header "^CGCT^"     /* Concurrent Garbage Collection Time (STW phase) */
+    data sun.gc.collector.2.time/sun.os.hrt.frequency
+    align right
+    width 8
+    scale sec
+    format "0.000"
+  }
+  column {
     header "^GCT^"      /* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
     format "0.000"
   }