--- old/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options 2016-05-05 13:55:17.371732500 +0900 +++ new/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options 2016-05-05 13:55:17.237732500 +0900 @@ -255,8 +255,24 @@ 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 @@ -408,6 +424,14 @@ 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 { @@ -491,8 +515,24 @@ 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 @@ -690,6 +730,14 @@ 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 { @@ -765,8 +813,24 @@ 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 @@ -831,8 +895,24 @@ 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 @@ -913,8 +993,24 @@ 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 @@ -1003,8 +1099,24 @@ 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 --- old/test/sun/tools/jstat/gcCapacityOutput1.awk 2016-05-05 13:55:17.700732500 +0900 +++ new/test/sun/tools/jstat/gcCapacityOutput1.awk 2016-05-05 13:55:17.567732500 +0900 @@ -3,19 +3,21 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC -# 4096.0 657408.0 8192.0 512.0 512.0 3072.0 6144.0 1312768.0 6144.0 6144.0 512.0 132096.0 5120.0 512.0 131072.0 512.0 1 0 +# NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC CGC +# 4096.0 657408.0 8192.0 512.0 512.0 3072.0 6144.0 1312768.0 6144.0 6144.0 512.0 132096.0 5120.0 512.0 131072.0 512.0 1 0 0 + + BEGIN { headerlines=0; datalines=0; totallines=0 } -/^ NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC $/ { +/^ NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC CGC $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+[ ]*[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstat/gcCauseOutput1.awk 2016-05-05 13:55:17.941732500 +0900 +++ new/test/sun/tools/jstat/gcCauseOutput1.awk 2016-05-05 13:55:17.865732500 +0900 @@ -3,15 +3,15 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# S0 S1 E O M CCS YGC YGCT FGC FGCT GCT LGCC GCC -# 0.00 0.00 0.00 9.97 90.94 87.70 2 0.013 0 0.000 0.013 Allocation Failure No GC +# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT LGCC GCC +# 0.00 0.00 0.00 9.97 90.94 87.70 2 0.013 0 0.000 0 0.000 0.013 Allocation Failure No GC BEGIN { headerlines=0; datalines=0; totallines=0 } -/^ S0 S1 E O M CCS YGC YGCT FGC FGCT GCT LGCC GCC $/ { +/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT LGCC GCC $/ { headerlines++; } @@ -23,7 +23,7 @@ # or more letters and spaces. It also provides for the ".", "(", and ")" # characters to allow for the string "System.gc()". # -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[a-zA-Z]+[a-zA-Z \.\(\)]*[ ]*[a-zA-Z]+[a-zA-Z \.\(\)]*$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[a-zA-Z]+[a-zA-Z \.\(\)]*[ ]*[a-zA-Z]+[a-zA-Z \.\(\)]*$/ { datalines++; } --- old/test/sun/tools/jstat/gcMetaCapacityOutput1.awk 2016-05-05 13:55:18.173732500 +0900 +++ new/test/sun/tools/jstat/gcMetaCapacityOutput1.awk 2016-05-05 13:55:18.097732500 +0900 @@ -3,18 +3,18 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC FGCT GCT -# 512.0 132096.0 5120.0 512.0 131072.0 512.0 1 0 0.000 0.004 +# MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC FGCT CGC CGCT GCT +# 512.0 132096.0 5120.0 512.0 131072.0 512.0 1 0 0.000 0 0.000 0.004 BEGIN { headerlines=0; datalines=0; totallines=0 } -/^ MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC FGCT GCT $/ { +/^ MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC FGCT CGC CGCT GCT $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstat/gcNewCapacityOutput1.awk 2016-05-05 13:55:18.406732500 +0900 +++ new/test/sun/tools/jstat/gcNewCapacityOutput1.awk 2016-05-05 13:55:18.329732500 +0900 @@ -3,19 +3,20 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# NGCMN NGCMX NGC S0CMX S0C S1CMX S1C ECMX EC YGC FGC -# 2176.0 7232.0 2176.0 192.0 64.0 192.0 64.0 6848.0 2048.0 1 0 +# NGCMN NGCMX NGC S0CMX S0C S1CMX S1C ECMX EC YGC FGC CGC +# 2176.0 7232.0 2176.0 192.0 64.0 192.0 64.0 6848.0 2048.0 1 0 0 + BEGIN { headerlines=0; datalines=0; totallines=0 } -/^ NGCMN NGCMX NGC S0CMX S0C S1CMX S1C ECMX EC YGC FGC $/ { +/^ NGCMN NGCMX NGC S0CMX S0C S1CMX S1C ECMX EC YGC FGC CGC $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+[ ]*[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstat/gcOldCapacityOutput1.awk 2016-05-05 13:55:18.638732500 +0900 +++ new/test/sun/tools/jstat/gcOldCapacityOutput1.awk 2016-05-05 13:55:18.563732500 +0900 @@ -3,18 +3,18 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# OGCMN OGCMX OGC OC YGC FGC FGCT GCT -# 6016.0 58304.0 6016.0 6016.0 1 0 0.000 0.030 +# OGCMN OGCMX OGC OC YGC FGC FGCT CGC CGCT GCT +# 6016.0 58304.0 6016.0 6016.0 1 0 0.000 0 0.000 0.030 BEGIN { headerlines=0; datalines=0; totallines=0 } -/^ OGCMN OGCMX OGC OC YGC FGC FGCT GCT $/ { +/^ OGCMN OGCMX OGC OC YGC FGC FGCT CGC CGCT GCT $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstat/gcOldOutput1.awk 2016-05-05 13:55:18.871732500 +0900 +++ new/test/sun/tools/jstat/gcOldOutput1.awk 2016-05-05 13:55:18.795732500 +0900 @@ -3,7 +3,7 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# MC MU CCSC CCSU OC OU YGC FGC FGCT GCT +# MC MU CCSC CCSU OC OU YGC FGC FGCT CGC CGCT GCT # 5120.0 4152.0 512.0 397.9 6144.0 200.0 1 0 0.000 0.005 @@ -11,11 +11,11 @@ headerlines=0; datalines=0; totallines=0 } -/^ MC MU CCSC CCSU OC OU YGC FGC FGCT GCT $/ { +/^ MC MU CCSC CCSU OC OU YGC FGC FGCT CGC CGCT GCT $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstat/gcOutput1.awk 2016-05-05 13:55:19.113732500 +0900 +++ new/test/sun/tools/jstat/gcOutput1.awk 2016-05-05 13:55:19.036732500 +0900 @@ -3,19 +3,19 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT GCT -# 512.0 512.0 0.0 496.0 3072.0 615.5 6144.0 280.0 5120.0 4176.0 512.0 401.0 1 0.005 0 0.000 0.005 +# S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT CGC CGCT GCT +# 512.0 512.0 0.0 496.0 3072.0 615.5 6144.0 280.0 5120.0 4176.0 512.0 401.0 1 0.005 0 0.000 0 0.000 0.005 BEGIN { headerlines=0; datalines=0; totallines=0 } -/^ S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT GCT $/ { +/^ S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT CGC CGCT GCT $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstat/lineCounts1.awk 2016-05-05 13:55:19.344732500 +0900 +++ new/test/sun/tools/jstat/lineCounts1.awk 2016-05-05 13:55:19.268732500 +0900 @@ -3,22 +3,22 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# S0 S1 E O M CCS YGC YGCT FGC FGCT GCT -# 0.00 93.76 28.80 1.82 77.74 68.02 1 0.005 0 0.000 0.005 -# 0.00 93.76 73.04 1.82 77.74 68.02 1 0.005 0 0.000 0.005 -# 0.00 93.76 73.04 1.82 77.74 68.02 1 0.005 0 0.000 0.005 -# 0.00 93.76 73.04 1.82 77.74 68.02 1 0.005 0 0.000 0.005 -# 0.00 93.76 75.00 1.82 77.74 68.02 1 0.005 0 0.000 0.005 +# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT +# 0.00 93.76 28.80 1.82 77.74 68.02 1 0.005 0 0.000 0 0.000 0.005 +# 0.00 93.76 73.04 1.82 77.74 68.02 1 0.005 0 0.000 0 0.000 0.005 +# 0.00 93.76 73.04 1.82 77.74 68.02 1 0.005 0 0.000 0 0.000 0.005 +# 0.00 93.76 73.04 1.82 77.74 68.02 1 0.005 0 0.000 0 0.000 0.005 +# 0.00 93.76 75.00 1.82 77.74 68.02 1 0.005 0 0.000 0 0.000 0.005 BEGIN { headerlines=0; datalines=0; totallines=0 } -/^ S0 S1 E O M CCS YGC YGCT FGC FGCT GCT $/ { +/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstat/lineCounts2.awk 2016-05-05 13:55:19.576732500 +0900 +++ new/test/sun/tools/jstat/lineCounts2.awk 2016-05-05 13:55:19.501732500 +0900 @@ -3,18 +3,18 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# S0 S1 E O M CCS YGC YGCT FGC FGCT GCT -# 0.00 93.76 28.40 1.82 77.74 68.02 1 0.005 0 0.000 0.005 +# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT +# 0.00 93.76 28.40 1.82 77.74 68.02 1 0.005 0 0.000 0 0.000 0.005 BEGIN { headerlines=0; datalines=0; totallines=0 } -/^ S0 S1 E O M CCS YGC YGCT FGC FGCT GCT $/ { +/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstat/lineCounts3.awk 2016-05-05 13:55:19.809732500 +0900 +++ new/test/sun/tools/jstat/lineCounts3.awk 2016-05-05 13:55:19.734732500 +0900 @@ -3,27 +3,27 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# S0 S1 E O M CCS YGC YGCT FGC FGCT GCT -# 0.00 93.76 26.48 1.95 77.78 68.02 1 0.006 0 0.000 0.006 -# 0.00 93.76 71.58 1.95 77.78 68.02 1 0.006 0 0.000 0.006 -# 0.00 93.76 73.58 1.95 77.78 68.02 1 0.006 0 0.000 0.006 -# 0.00 93.76 73.58 1.95 77.78 68.02 1 0.006 0 0.000 0.006 -# 0.00 93.76 73.58 1.95 77.78 68.02 1 0.006 0 0.000 0.006 -# 0.00 93.76 75.58 1.95 77.78 68.02 1 0.006 0 0.000 0.006 -# 0.00 93.76 75.58 1.95 77.78 68.02 1 0.006 0 0.000 0.006 -# 0.00 93.76 77.58 1.95 77.78 68.02 1 0.006 0 0.000 0.006 -# 0.00 93.76 77.58 1.95 77.78 68.02 1 0.006 0 0.000 0.006 -# 0.00 93.76 77.58 1.95 77.78 68.02 1 0.006 0 0.000 0.006 +# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT +# 0.00 93.76 26.48 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 +# 0.00 93.76 71.58 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 +# 0.00 93.76 73.58 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 +# 0.00 93.76 73.58 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 +# 0.00 93.76 73.58 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 +# 0.00 93.76 75.58 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 +# 0.00 93.76 75.58 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 +# 0.00 93.76 77.58 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 +# 0.00 93.76 77.58 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 +# 0.00 93.76 77.58 1.95 77.78 68.02 1 0.006 0 0.000 0 0.000 0.006 BEGIN { headerlines=0; datalines=0; totallines=0 } -/^ S0 S1 E O M CCS YGC YGCT FGC FGCT GCT $/ { +/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstat/lineCounts4.awk 2016-05-05 13:55:20.042732500 +0900 +++ new/test/sun/tools/jstat/lineCounts4.awk 2016-05-05 13:55:19.966732500 +0900 @@ -3,30 +3,30 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -# S0 S1 E O M CCS YGC YGCT FGC FGCT GCT -# 0.00 96.88 66.55 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# 0.00 96.88 71.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# 0.00 96.88 73.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# 0.00 96.88 73.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# 0.00 96.88 73.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# 0.00 96.88 75.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# 0.00 96.88 75.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# 0.00 96.88 77.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# 0.00 96.88 77.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# 0.00 96.88 77.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 -# S0 S1 E O M CCS YGC YGCT FGC FGCT GCT -# 0.00 96.88 79.58 2.34 77.78 68.02 1 0.003 0 0.000 0.003 +# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT +# 0.00 96.88 66.55 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# 0.00 96.88 71.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# 0.00 96.88 73.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# 0.00 96.88 73.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# 0.00 96.88 73.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# 0.00 96.88 75.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# 0.00 96.88 75.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# 0.00 96.88 77.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# 0.00 96.88 77.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# 0.00 96.88 77.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 +# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT +# 0.00 96.88 79.58 2.34 77.78 68.02 1 0.003 0 0.000 0 0.000 0.003 BEGIN { headerlines=0; datalines=0; totallines=0 datalines2=0; } -/^ S0 S1 E O M CCS YGC YGCT FGC FGCT GCT $/ { +/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { if (headerlines == 2) { datalines2++; } --- old/test/sun/tools/jstat/timeStamp1.awk 2016-05-05 13:55:20.274732500 +0900 +++ new/test/sun/tools/jstat/timeStamp1.awk 2016-05-05 13:55:20.198732500 +0900 @@ -3,18 +3,18 @@ # that the numerical values conform to a specific pattern, rather than # specific values. # -#Timestamp S0 S1 E O M CCS YGC YGCT FGC FGCT GCT -# 0.3 0.00 100.00 68.74 1.95 77.73 68.02 1 0.004 0 0.000 0.004 +#Timestamp S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT +# 0.3 0.00 100.00 68.74 1.95 77.73 68.02 1 0.004 0 0.000 0 0.000 0.004 BEGIN { headerlines=0; datalines=0; totallines=0 } -/^Timestamp S0 S1 E O M CCS YGC YGCT FGC FGCT GCT $/ { +/^Timestamp S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT $/ { headerlines++; } -/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { +/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { datalines++; } --- old/test/sun/tools/jstatd/JstatGCUtilParser.java 2016-05-05 13:55:20.532732500 +0900 +++ new/test/sun/tools/jstatd/JstatGCUtilParser.java 2016-05-05 13:55:20.438732500 +0900 @@ -29,12 +29,12 @@ /** * The helper class for parsing following output from command 'jstat -gcutil': * - * S0 S1 E O M CCS YGC YGCT FGC FGCT GCT - * 100.00 0.00 64.68 13.17 73.39 33.46 2 0.003 1 0.156 0.158 - * 100.00 0.00 76.54 13.17 73.39 33.46 2 0.003 1 0.156 0.158 - * 100.00 0.00 83.49 13.17 73.39 33.46 2 0.003 1 0.156 0.158 - * 100.00 0.00 84.53 13.17 73.39 33.46 2 0.003 1 0.156 0.158 - * 100.00 0.00 85.57 13.17 73.39 33.46 2 0.003 1 0.156 0.158 + * S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT + * 100.00 0.00 64.68 13.17 73.39 33.46 2 0.003 1 0.156 0 0.00 0.158 + * 100.00 0.00 76.54 13.17 73.39 33.46 2 0.003 1 0.156 0 0.00 0.158 + * 100.00 0.00 83.49 13.17 73.39 33.46 2 0.003 1 0.156 0 0.00 0.158 + * 100.00 0.00 84.53 13.17 73.39 33.46 2 0.003 1 0.156 0 0.00 0.158 + * 100.00 0.00 85.57 13.17 73.39 33.46 2 0.003 1 0.156 0 0.00 0.158 * * It will be verified that numerical values have defined types and are reasonable, * for example percentage should fit within 0-100 interval. @@ -56,6 +56,8 @@ YGCT(GcStatisticsType.DOUBLE), FGC(GcStatisticsType.INTEGER), FGCT(GcStatisticsType.DOUBLE), + CGC(GcStatisticsType.INTEGER), + CGCT(GcStatisticsType.DOUBLE), GCT(GcStatisticsType.DOUBLE); private final GcStatisticsType type;