src/share/classes/sun/tools/jstat/resources/jstat_options

rev 6420 : 8004172: NPG: Update jstat counter names to reflect metaspace changes

@@ -190,20 +190,20 @@
     width 10
     scale K
     format "0.0"
   }
   column {
-    header "^PC^"       /* Perm Space Capacity - Current */
-    data sun.gc.generation.2.space.0.capacity
+    header "^MC^"       /* Metaspace Capacity - Current */
+    data sun.rt.metaspace.capacity
     align center
     width 6
     scale K
     format "0.0"
   }
   column {
-    header "^PU^"       /* Perm Space Used */
-    data sun.gc.generation.2.space.0.used
+    header "^MU^"       /* Metaspae Used */
+    data sun.rt.metaspace.used
     align center
     width 6
     scale K
     format "0.0"
   }

@@ -328,36 +328,28 @@
     align right
     width 10
     format "0.0"
   }
   column {
-    header "^PGCMN^"    /* Perm Generation Capacity - Minimum */
-    data sun.gc.generation.2.minCapacity
+    header "^MCMN^"     /* Metaspace Capacity - Minimum */
+    data sun.rt.metaspace.minCapacity
     scale K
     align right
     width 8
     format "0.0"
   }
   column {
-    header "^PGCMX^"    /* Perm Generation Capacity - Maximum */
-    data sun.gc.generation.2.maxCapacity
+    header "^MCMX^"     /* Metaspace Capacity - Maximum */
+    data sun.rt.metaspace.maxCapacity
     scale K
     align right
     width 8
     format "0.0"
   }
   column {
-    header "^PGC^"      /* Perm Generation Capacity - Current */
-    data sun.gc.generation.2.capacity
-    scale K
-    align right
-    width 8
-    format "0.0"
-  }
-  column {
-    header "^PC^"       /* Perm Space Capacity - Current */
-    data sun.gc.generation.2.space.0.capacity
+    header "^MC^"       /* Metaspace Capacity - Current */
+    data sun.rt.metaspace.capacity
     scale K
     align right
     width 8
     format "0.0"
   }

@@ -410,12 +402,12 @@
     scale raw
     width 6
     format "0.00"
   }
   column {
-    header "^P^"        /* Perm Space - Percent Used */
-    data (1-((sun.gc.generation.2.space.0.capacity - sun.gc.generation.2.space.0.used)/sun.gc.generation.2.space.0.capacity)) * 100
+    header "^M^"        /* Metaspace - Percent Used */
+    data (1-((sun.rt.metaspace.capacity - sun.rt.metaspace.used)/sun.rt.metaspace.capacity)) * 100
     align right
     width 6
     scale raw
     format "0.00"
   }

@@ -652,20 +644,20 @@
   }
 }
 
 option gcold {
   column {
-    header "^PC^"       /* Perm Space Capacity - Current */
-    data sun.gc.generation.2.space.0.capacity
+    header "^MC^"       /* Metaspace Capacity - Current */
+    data sun.rt.metaspace.capacity
     width 8
     align right
     scale K
     format "0.0"
   }
   column {
-    header "^PU^"       /* Perm Space Used */
-    data sun.gc.generation.2.space.0.used
+    header "^MU^"       /* Metaspace Space Used */
+    data sun.rt.metaspace.used
     width 8
     align right
     scale K
     format "0.0"
   }

@@ -782,38 +774,30 @@
     scale sec
     format "0.000"
   }
 }
 
-option gcpermcapacity {
-  column {
-    header "^PGCMN^"    /* Perm Generation Capacity - Minumum */
-    data sun.gc.generation.2.minCapacity
-    scale K
-    align right
-    width 10
-    format "0.0"
-  }
+option gcmetacapacity {
   column {
-    header "^PGCMX^"    /* Perm Generation Capacity - Maximum */
-    data sun.gc.generation.2.maxCapacity
+    header "^MCMN^"     /* Metaspace Capacity - Minimum */
+    data sun.rt.metaspace.minCapacity
     scale K
     align right
     width 10
     format "0.0"
   }
   column {
-    header "^PGC^"      /* Perm Generation Capacity - Current */
-    data sun.gc.generation.2.capacity
+    header "^MCMX^"     /* Metaspace Capacity - Maximum */
+    data sun.rt.metaspace.maxCapacity
     scale K
     align right
     width 10
     format "0.0"
   }
   column {
-    header "^PC^"       /* Perm Space Capacity - Current */
-    data sun.gc.generation.2.space.0.capacity
+    header "^MC^"       /* Metaspace Capacity - Current */
+    data sun.rt.metaspace.capacity
     scale K
     align right
     width 10
     format "0.0"
   }

@@ -882,12 +866,12 @@
     scale raw
     width 6
     format "0.00"
   }
   column {
-    header "^P^"        /* Perm Space - Percent Used */
-    data (1-((sun.gc.generation.2.space.0.capacity - sun.gc.generation.2.space.0.used)/sun.gc.generation.2.space.0.capacity)) * 100
+    header "^M^"        /* Metaspace Space - Percent Used */
+    data (1-((sun.rt.metaspace.capacity - sun.rt.metaspace.used)/sun.rt.metaspace.capacity)) * 100
     align right
     width 6
     scale raw
     format "0.00"
   }