stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8245129: Enhance jstat gc option output and tests

Browse Source 
Widen and right-justify size fields assuming 2tb heap

Reviewed-by: simonis, dtitov
This commit is contained in:
Paul Hohensee 2020-06-29 13:39:35 -07:00
parent ba711f63ba
commit 51b7c76a95
33 changed files with 338 additions and 216 deletions

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2020, 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
@ -131,95 +131,95 @@ option gc {
header "^S0C^" /* Survivor 0 Space Capacity - Current */
data sun.gc.generation.0.space.1.capacity
scale K
align center
width 6
align right
width 11
format "0.0"
}
column {
header "^S1C^" /* Survivor 1 Space Capacity - Current */
data sun.gc.generation.0.space.2.capacity
scale K
align center
width 6
align right
width 11
format "0.0"
}
column {
header "^S0U^" /* Survivor 0 Space Used */
data sun.gc.generation.0.space.1.used
scale K
align center
width 6
align right
width 11
format "0.0"
}
column {
header "^S1U^" /* Survivor 1 Space Used */
data sun.gc.generation.0.space.2.used
scale K
align center
width 6
align right
width 11
format "0.0"
}
column {
header "^EC^" /* Eden Space Capacity - Current */
data sun.gc.generation.0.space.0.capacity
align center
align right
scale K
width 8
width 12
format "0.0"
}
column {
header "^EU^" /* Eden Space Used */
data sun.gc.generation.0.space.0.used
align center
align right
scale K
width 8
width 12
format "0.0"
}
column {
header "^OC^" /* Old Space Capacity - Current */
data sun.gc.generation.1.space.0.capacity
align center
align right
scale K
width 10
width 12
format "0.0"
}
column {
header "^OU^" /* Old Space Used */
data sun.gc.generation.1.space.0.used
align center
width 10
align right
width 12
scale K
format "0.0"
}
column {
header "^MC^" /* Metaspace Capacity - Current */
data sun.gc.metaspace.capacity
align center
width 6
align right
width 10
scale K
format "0.0"
}
column {
header "^MU^" /* Metaspae Used */
header "^MU^" /* Metaspace Used */
data sun.gc.metaspace.used
align center
width 6
align right
width 10
scale K
format "0.0"
}
column {
header "^CCSC^" /* Compressed Class Space Capacity - Current */
data sun.gc.compressedclassspace.capacity
align center
width 6
align right
width 9
scale K
format "0.0"
}
column {
header "^CCSU^" /* Compressed Class Space Used */
data sun.gc.compressedclassspace.used
align center
width 6
align right
width 9
scale K
format "0.0"
}
@ -231,42 +231,42 @@ option gc {
format "0"
}
column {
header "^YGCT^" /* Young Generation Garbage Collection Time */
header "^YGCT^" /* Young Generation Collection Time */
data sun.gc.collector.0.time/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
}
column {
header "^FGC^" /* Full Collections */
data sun.gc.collector.1.invocations
align center
align right
width 5
scale raw
format "0"
}
column {
header "^FGCT^" /* Full Garbage Collection Time */
header "^FGCT^" /* Full Collection Time */
data sun.gc.collector.1.time/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
}
column {
header "^CGC^" /* Concurrent Collections (STW phase) */
data sun.gc.collector.2.invocations
align center
align right
width 5
scale raw
format "0"
}
column {
header "^CGCT^" /* Concurrent Garbage Collection Time (STW phase) */
header "^CGCT^" /* Concurrent Collection Time (STW phase) */
data sun.gc.collector.2.time/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
}
@ -274,7 +274,7 @@ option gc {
header "^GCT^" /* Total Garbage Collection Time */
data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
required true
@ -287,7 +287,7 @@ option gccapacity {
data sun.gc.generation.0.minCapacity
scale K
align right
width 8
width 12
format "0.0"
}
column {
@ -295,7 +295,7 @@ option gccapacity {
data sun.gc.generation.0.maxCapacity
scale K
align right
width 8
width 12
format "0.0"
}
column {
@ -303,7 +303,7 @@ option gccapacity {
data sun.gc.generation.0.capacity
scale K
align right
width 8
width 12
format "0.0"
}
column {
@ -311,7 +311,7 @@ option gccapacity {
data sun.gc.generation.0.space.1.capacity
scale K
align right
width 6
width 11
format "0.0"
}
column {
@ -319,7 +319,7 @@ option gccapacity {
data sun.gc.generation.0.space.2.capacity
scale K
align right
width 6
width 11
format "0.0"
}
column {
@ -327,7 +327,7 @@ option gccapacity {
data sun.gc.generation.0.space.0.capacity
scale K
align right
width 8
width 12
format "0.0"
}
column {
@ -335,7 +335,7 @@ option gccapacity {
data sun.gc.generation.1.minCapacity
scale K
align right
width 10
width 12
format "0.0"
}
column {
@ -343,7 +343,7 @@ option gccapacity {
data sun.gc.generation.1.maxCapacity
scale K
align right
width 10
width 12
format "0.0"
}
column {
@ -351,7 +351,7 @@ option gccapacity {
data sun.gc.generation.1.capacity
scale K
align right
width 10
width 12
format "0.0"
}
column {
@ -359,7 +359,7 @@ option gccapacity {
data sun.gc.generation.1.space.0.capacity
scale K
align right
width 10
width 12
format "0.0"
}
column {
@ -367,7 +367,7 @@ option gccapacity {
data sun.gc.metaspace.minCapacity
scale K
align right
width 8
width 10
format "0.0"
}
column {
@ -375,7 +375,7 @@ option gccapacity {
data sun.gc.metaspace.maxCapacity
scale K
align right
width 8
width 10
format "0.0"
}
column {
@ -383,7 +383,7 @@ option gccapacity {
data sun.gc.metaspace.capacity
scale K
align right
width 8
width 10
format "0.0"
}
column {
@ -391,7 +391,7 @@ option gccapacity {
data sun.gc.compressedclassspace.minCapacity
scale K
align right
width 8
width 9
format "0.0"
}
column {
@ -399,7 +399,7 @@ option gccapacity {
data sun.gc.compressedclassspace.maxCapacity
scale K
align right
width 8
width 9
format "0.0"
}
column {
@ -407,7 +407,7 @@ option gccapacity {
data sun.gc.compressedclassspace.capacity
scale K
align right
width 8
width 9
format "0.0"
}
column {
@ -496,7 +496,7 @@ option gccause {
data sun.gc.collector.0.time/sun.os.hrt.frequency
align right
scale sec
width 8
width 9
format "0.000"
}
column {
@ -512,7 +512,7 @@ option gccause {
data sun.gc.collector.1.time/sun.os.hrt.frequency
align right
scale sec
width 8
width 9
format "0.000"
}
column {
@ -524,10 +524,10 @@ option gccause {
format "0"
}
column {
header "^CGCT^" /* Concurrent Garbage Collection Time (STW phase) */
header "^CGCT^" /* Concurrent Collection Time (STW phase) */
data sun.gc.collector.2.time/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
}
@ -535,7 +535,7 @@ option gccause {
header "^GCT^" /* Total Garbage Collection Time */
data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
required true
@ -562,7 +562,7 @@ option gcnew {
data sun.gc.generation.0.space.1.capacity
scale K
align right
width 6
width 11
format "0.0"
}
column {
@ -570,7 +570,7 @@ option gcnew {
data sun.gc.generation.0.space.2.capacity
scale K
align right
width 6
width 11
format "0.0"
}
column {
@ -578,7 +578,7 @@ option gcnew {
data sun.gc.generation.0.space.1.used
scale K
align right
width 6
width 11
format "0.0"
}
column {
@ -586,7 +586,7 @@ option gcnew {
data sun.gc.generation.0.space.2.used
scale K
align right
width 6
width 11
format "0.0"
}
column {
@ -607,7 +607,7 @@ option gcnew {
header "^DSS^" /* Desired Survivor Size */
data sun.gc.policy.desiredSurvivorSize
scale K
width 6
width 11
align right
format "0.0"
}
@ -615,7 +615,7 @@ option gcnew {
header "^EC^" /* Eden Space Capacity - Current */
data sun.gc.generation.0.space.0.capacity
scale K
width 8
width 12
align right
format "0.0"
}
@ -623,7 +623,7 @@ option gcnew {
header "^EU^" /* Eden Space Used */
data sun.gc.generation.0.space.0.used
scale K
width 8
width 12
align right
format "0.0"
}
@ -639,7 +639,7 @@ option gcnew {
data sun.gc.collector.0.time/sun.os.hrt.frequency
align right
scale sec
width 8
width 9
format "0.000"
}
}
@ -650,7 +650,7 @@ option gcnewcapacity {
data sun.gc.generation.0.minCapacity
scale K
align right
width 10
width 12
format "0.0"
}
column {
@ -658,7 +658,7 @@ option gcnewcapacity {
data sun.gc.generation.0.maxCapacity
scale K
align right
width 10
width 12
format "0.0"
}
column {
@ -666,7 +666,7 @@ option gcnewcapacity {
data sun.gc.generation.0.capacity
scale K
align right
width 10
width 12
format "0.0"
}
column {
@ -674,7 +674,7 @@ option gcnewcapacity {
data sun.gc.generation.0.space.1.maxCapacity
scale K
align right
width 8
width 11
format "0.0"
}
column {
@ -682,7 +682,7 @@ option gcnewcapacity {
data sun.gc.generation.0.space.1.capacity
scale K
align right
width 8
width 11
format "0.0"
}
column {
@ -690,7 +690,7 @@ option gcnewcapacity {
data sun.gc.generation.0.space.2.maxCapacity
scale K
align right
width 8
width 11
format "0.0"
}
column {
@ -698,7 +698,7 @@ option gcnewcapacity {
data sun.gc.generation.0.space.2.capacity
scale K
align right
width 8
width 11
format "0.0"
}
column {
@ -706,7 +706,7 @@ option gcnewcapacity {
data sun.gc.generation.0.space.0.maxCapacity
scale K
align right
width 10
width 12
format "0.0"
}
column {
@ -714,14 +714,14 @@ option gcnewcapacity {
data sun.gc.generation.0.space.0.capacity
scale K
align right
width 10
width 12
format "0.0"
}
column {
header "^YGC^" /* Young Generation Collections */
data sun.gc.collector.0.invocations
align right
width 5
width 6
format "0"
}
column {
@ -746,7 +746,7 @@ option gcold {
column {
header "^MC^" /* Metaspace Capacity - Current */
data sun.gc.metaspace.capacity
width 8
width 10
align right
scale K
format "0.0"
@ -754,7 +754,7 @@ option gcold {
column {
header "^MU^" /* Metaspace Space Used */
data sun.gc.metaspace.used
width 8
width 10
align right
scale K
format "0.0"
@ -762,7 +762,7 @@ option gcold {
column {
header "^CCSC^" /* Compressed Class Space Capacity - Current */
data sun.gc.compressedclassspace.capacity
width 8
width 9
align right
scale K
format "0.0"
@ -770,7 +770,7 @@ option gcold {
column {
header "^CCSU^" /* Compressed Class Space Used */
data sun.gc.compressedclassspace.used
width 8
width 9
align right
scale K
format "0.0"
@ -778,7 +778,7 @@ option gcold {
column {
header "^OC^" /* Old Space Capacity - Current */
data sun.gc.generation.1.space.0.capacity
width 11
width 12
align right
scale K
format "0.0"
@ -786,7 +786,7 @@ option gcold {
column {
header "^OU^" /* Old Space Used */
data sun.gc.generation.1.space.0.used
width 11
width 12
align right
scale K
format "0.0"
@ -811,7 +811,7 @@ option gcold {
data sun.gc.collector.1.time/sun.os.hrt.frequency
align right
scale sec
width 8
width 9
format "0.000"
}
column {
@ -823,10 +823,10 @@ option gcold {
format "0"
}
column {
header "^CGCT^" /* Concurrent Garbage Collection Time (STW phase) */
header "^CGCT^" /* Concurrent Collection Time (STW phase) */
data sun.gc.collector.2.time/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
}
@ -834,7 +834,7 @@ option gcold {
header "^GCT^" /* Total Garbage Collection Time */
data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
required true
@ -847,7 +847,7 @@ option gcoldcapacity {
data sun.gc.generation.1.minCapacity
scale K
align right
width 11
width 12
format "0.0"
}
column {
@ -855,7 +855,7 @@ option gcoldcapacity {
data sun.gc.generation.1.maxCapacity
scale K
align right
width 11
width 12
format "0.0"
}
column {
@ -863,7 +863,7 @@ option gcoldcapacity {
data sun.gc.generation.1.capacity
scale K
align right
width 11
width 12
format "0.0"
}
column {
@ -871,14 +871,14 @@ option gcoldcapacity {
data sun.gc.generation.1.space.0.capacity
scale K
align right
width 11
width 12
format "0.0"
}
column {
header "^YGC^" /* Young Generation Collections */
data sun.gc.collector.0.invocations
align right
width 5
width 6
format "0"
}
column {
@ -894,7 +894,7 @@ option gcoldcapacity {
data sun.gc.collector.1.time/sun.os.hrt.frequency
align right
scale sec
width 8
width 9
format "0.000"
}
column {
@ -906,10 +906,10 @@ option gcoldcapacity {
format "0"
}
column {
header "^CGCT^" /* Concurrent Garbage Collection Time (STW phase) */
header "^CGCT^" /* Concurrent Collection Time (STW phase) */
data sun.gc.collector.2.time/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
}
@ -917,7 +917,7 @@ option gcoldcapacity {
header "^GCT^" /* Total Garbage Collection Time */
data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
required true
@ -954,7 +954,7 @@ option gcmetacapacity {
data sun.gc.compressedclassspace.minCapacity
scale K
align right
width 10
width 9
format "0.0"
}
column {
@ -962,7 +962,7 @@ option gcmetacapacity {
data sun.gc.compressedclassspace.maxCapacity
scale K
align right
width 10
width 9
format "0.0"
}
column {
@ -970,14 +970,14 @@ option gcmetacapacity {
data sun.gc.compressedclassspace.capacity
scale K
align right
width 10
width 9
format "0.0"
}
column {
header "^YGC^" /* Young Generation Collections */
data sun.gc.collector.0.invocations
align right
width 5
width 6
format "0"
}
column {
@ -993,7 +993,7 @@ option gcmetacapacity {
data sun.gc.collector.1.time/sun.os.hrt.frequency
align right
scale sec
width 8
width 9
format "0.000"
}
column {
@ -1005,10 +1005,10 @@ option gcmetacapacity {
format "0"
}
column {
header "^CGCT^" /* Concurrent Garbage Collection Time (STW phase) */
header "^CGCT^" /* Concurrent Collection Time (STW phase) */
data sun.gc.collector.2.time/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
}
@ -1016,7 +1016,7 @@ option gcmetacapacity {
header "^GCT^" /* Total Garbage Collection Time */
data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
required true
@ -1084,7 +1084,7 @@ option gcutil {
data sun.gc.collector.0.time/sun.os.hrt.frequency
align right
scale sec
width 8
width 9
format "0.000"
}
column {
@ -1100,7 +1100,7 @@ option gcutil {
data sun.gc.collector.1.time/sun.os.hrt.frequency
align right
scale sec
width 8
width 9
format "0.000"
}
column {
@ -1112,10 +1112,10 @@ option gcutil {
format "0"
}
column {
header "^CGCT^" /* Concurrent Garbage Collection Time (STW phase) */
header "^CGCT^" /* Concurrent Collection Time (STW phase) */
data sun.gc.collector.2.time/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
}
@ -1123,7 +1123,7 @@ option gcutil {
header "^GCT^" /* Total Garbage Collection Time */
data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
align right
width 8
width 9
scale sec
format "0.000"
required true

8
test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, 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
@ -25,9 +25,9 @@
* Results of running the JstatGcTool ("jstat -gccapacity <pid>")
*
* Output example:
* NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC YGC FGC
* 41984.0 671744.0 41984.0 5248.0 5248.0 31488.0 83968.0 1343488.0 83968.0 83968.0 512.0 110592.0 4480.0 0 0
* NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC CGC
* 0.0 4194304.0 6144.0 0.0 2048.0 4096.0 0.0 4194304.0 2048.0 2048.0 0.0 1056768.0 7680.0 0.0 1048576.0 768.0 4 0 0
*
* Output description:
* NGCMN Minimum new generation capacity (KB).
* NGCMX Maximum new generation capacity (KB).

6
test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCauseResults.java

@ -25,9 +25,9 @@
* Results of running the JstatGcTool ("jstat -gccause <pid>")
*
* Output example:
* S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT LGCC GCC
* 0.00 6.25 46.19 0.34 57.98 54.63 15305 1270.551 0 0.000 0 0.00 1270.551 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 53.70 97.40 92.67 4 0.286 19 17.890 2 0.086 18.263 System.gc() No GC
*
* Output description:
* S0 Survivor space 0 utilization as a percentage of the space's current capacity.
* S1 Survivor space 1 utilization as a percentage of the space's current capacity.

8
test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcNewResults.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, 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
@ -25,9 +25,9 @@
* Results of running the JstatGcTool ("jstat -gcnew <pid>")
*
* Output example:
* S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT
* 0.0 7168.0 0.0 7168.0 15 15 3584.0 62464.0 5120.0 27 0.340
* S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT
* 0.0 2048.0 0.0 1113.5 15 15 1024.0 4096.0 0.0 4 0.228
*
* Output description:
* S0C Current survivor space 0 capacity (KB).
* S1C Current survivor space 1 capacity (KB).

6
test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcResults.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, 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
@ -25,8 +25,8 @@
* Results of running the JstatGcTool ("jstat -gc <pid>")
*
* Output example:
* S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT CGC CGCT GCT
* 512.0 512.0 32.0 0.0 288768.0 168160.6 83968.0 288.1 4864.0 2820.3 512.0 279.7 18510 1559.208 0 0.000 0 0.0 1559.208
* S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT CGC CGCT GCT
* 0.0 2048.0 0.0 1079.5 4096.0 0.0 2048.0 0.0 7680.0 7378.6 768.0 664.7 4 0.140 0 0.000 0 0.000 0.140
*
* Output description:
* S0C Current survivor space 0 capacity (KB).

10
test/jdk/sun/tools/jstat/fileURITest1.awk

@ -3,18 +3,20 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# S0 S1 E O P YGC YGCT FGC FGCT GCT
# 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044
# -gcutil
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 0.00 0.00 47.17 97.15 92.31 20 0.335 696 334.382 2 0.069 334.786
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ S0 S1 E O P 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]+$/ {
datalines++;
}

14
test/jdk/sun/tools/jstat/gcCapacityOutput1.awk

@ -3,15 +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 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
# -gccapacity 0
#
# NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC CGC
# 0.0 4194304.0 6144.0 0.0 2048.0 4096.0 0.0 4194304.0 2048.0 2048.0 0.0 1056768.0 7680.0 0.0 1048576.0 768.0 4 0 0
#
# -J-XX:+UseParallelGC -gccapacity 0
#
# NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC CGC
# 1536.0 1397760.0 8192.0 1024.0 512.0 3072.0 512.0 2796544.0 5632.0 5632.0 0.0 1056768.0 8320.0 0.0 1048576.0 896.0 5 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 CGC $/ {
/^ NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC CGC $/ {
headerlines++;
}

15
test/jdk/sun/tools/jstat/gcCauseOutput1.awk

@ -3,16 +3,21 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# 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
# 0.00 0.00 82.15 0.00 - - 0 0.000 0 0.000 - - 0.000 No GC No GC
# -gccause 0
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT LGCC GCC
# 0.00 54.68 0.00 0.00 94.02 84.11 4 0.269 0 0.000 0 0.000 0.269 G1 Evacuation Pause No GC
#
# -J-XX:+UseSerialGC -gccause 0
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT LGCC GCC
# 78.14 0.00 68.23 15.57 94.69 88.17 4 0.204 0 0.000 - - 0.204 Allocation Failure No GC
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT LGCC GCC $/ {
/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT LGCC GCC $/ {
headerlines++;
}

13
test/jdk/sun/tools/jstat/gcMetaCapacityOutput1.awk

@ -3,14 +3,21 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# 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
# -gcmetacapacity 0
#
# MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC FGCT CGC CGCT GCT
# 0.0 1056768.0 8832.0 0.0 1048576.0 896.0 5 0 0.000 0 0.000 0.245
#
# -J-XX:+UseParallelGC -gcmetacapacity 0
#
# MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC FGCT CGC CGCT GCT
# 0.0 1056768.0 8064.0 0.0 1048576.0 896.0 4 0 0.000 - - 0.113
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC FGCT CGC CGCT GCT $/ {
/^ MCMN MCMX MC CCSMN CCSMX CCSC YGC FGC FGCT CGC CGCT GCT $/ {
headerlines++;
}

14
test/jdk/sun/tools/jstat/gcNewCapacityOutput1.awk

@ -3,15 +3,21 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# 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
# -gcnewcapacity 0
#
# NGCMN NGCMX NGC S0CMX S0C S1CMX S1C ECMX EC YGC FGC CGC
# 0.0 4194304.0 6144.0 0.0 0.0 4194304.0 2048.0 4194304.0 4096.0 4 0 0
#
# -J-XX:+UseParallelGC -gcnewcapacity 0
#
# NGCMN NGCMX NGC S0CMX S0C S1CMX S1C ECMX EC YGC FGC CGC
# 1536.0 1397760.0 7168.0 465920.0 512.0 465920.0 512.0 1396736.0 6144.0 4 0 -
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ NGCMN NGCMX NGC S0CMX S0C S1CMX S1C ECMX EC YGC FGC CGC $/ {
/^ NGCMN NGCMX NGC S0CMX S0C S1CMX S1C ECMX EC YGC FGC CGC $/ {
headerlines++;
}

15
test/jdk/sun/tools/jstat/gcNewOutput1.awk

@ -3,16 +3,21 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT
# 64.0 64.0 0.0 64.0 1 31 32.0 2048.0 41.4 1 0.031
# -gcnew 0
#
# S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT
# 0.0 2048.0 0.0 1113.5 15 15 1024.0 4096.0 0.0 4 0.228
#
# -J-XX:+UseParallelGC -gcnew 0
#
# S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT
# 1024.0 512.0 0.0 512.0 6 15 1024.0 3072.0 830.1 5 0.164
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT $/ {
/^ S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT $/ {
headerlines++;
}

13
test/jdk/sun/tools/jstat/gcOldCapacityOutput1.awk

@ -3,14 +3,21 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# 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
# -gcoldcapacity 0
#
# OGCMN OGCMX OGC OC YGC FGC FGCT CGC CGCT GCT
# 0.0 4194304.0 2048.0 2048.0 5 0 0.000 0 0.000 0.407
#
# -J-XX:+UseParallelGC -gcoldcpacity 0
#
# OGCMN OGCMX OGC OC YGC FGC FGCT CGC CGCT GCT
# 512.0 2796544.0 5632.0 5632.0 5 0 0.000 - - 0.180
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ OGCMN OGCMX OGC OC YGC FGC FGCT CGC CGCT GCT $/ {
/^ OGCMN OGCMX OGC OC YGC FGC FGCT CGC CGCT GCT $/ {
headerlines++;
}

14
test/jdk/sun/tools/jstat/gcOldOutput1.awk

@ -3,15 +3,21 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# 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
# -gcold 0
#
# MC MU CCSC CCSU OC OU YGC FGC FGCT CGC CGCT GCT
# 7680.0 7202.3 768.0 638.6 2048.0 0.0 4 0 0.000 0 0.000 0.240
#
# -J-XX:+UseParallelGC -gcold 0
#
# MC MU CCSC CCSU OC OU YGC FGC FGCT CGC CGCT GCT
# 8320.0 7759.4 896.0 718.3 5632.0 904.1 5 0 0.000 - - 0.175
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ MC MU CCSC CCSU OC OU YGC FGC FGCT CGC CGCT GCT $/ {
/^ MC MU CCSC CCSU OC OU YGC FGC FGCT CGC CGCT GCT $/ {
headerlines++;
}

13
test/jdk/sun/tools/jstat/gcOutput1.awk

@ -3,15 +3,22 @@
# 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 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
# -gc 0
#
# S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT CGC CGCT GCT
# 0.0 2048.0 0.0 1079.5 4096.0 0.0 2048.0 0.0 7680.0 7378.6 768.0 664.7 4 0.140 0 0.000 0 0.000 0.140
#
# -J-XX:+UseParallelGC -gc 0
#
# S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT CGC CGCT GCT
# 512.0 512.0 512.0 0.0 6144.0 634.8 5632.0 748.1 8320.0 7851.5 896.0 730.2 4 0.171 0 0.000 - - 0.171
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT CGC CGCT GCT $/ {
/^ S0C S1C S0U S1U EC EU OC OU MC MU CCSC CCSU YGC YGCT FGC FGCT CGC CGCT GCT $/ {
headerlines++;
}

3
test/jdk/sun/tools/jstat/jstatGcCapacityOutput1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gccapacity 0 2>&1 | awk -f ${TESTSRC}/gcCapacityOutput1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gccapacity 0 2>&1 | awk -f ${TESTSRC}/gcCapacityOutput1.awk

3
test/jdk/sun/tools/jstat/jstatGcCauseOutput1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -37,4 +37,5 @@ JSTAT="${TESTJAVA}/bin/jstat"
# class machine, ergonomics will automatically use UseParallelGC.
# The UseParallelGC collector does not currently update the gc cause counters.
${JSTAT} ${COMMON_JSTAT_FLAGS} -gccause 0 2>&1 | awk -f ${TESTSRC}/gcCauseOutput1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseSerialGC -gccause 0 2>&1 | awk -f ${TESTSRC}/gcCauseOutput1.awk

3
test/jdk/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2013, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcmetacapacity 0 2>&1 | awk -f ${TESTSRC}/gcMetaCapacityOutput1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcmetacapacity 0 2>&1 | awk -f ${TESTSRC}/gcMetaCapacityOutput1.awk

3
test/jdk/sun/tools/jstat/jstatGcNewCapacityOutput1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcnewcapacity 0 2>&1 | awk -f ${TESTSRC}/gcNewCapacityOutput1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcnewcapacity 0 2>&1 | awk -f ${TESTSRC}/gcNewCapacityOutput1.awk

3
test/jdk/sun/tools/jstat/jstatGcNewOutput1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcnew 0 2>&1 | awk -f ${TESTSRC}/gcNewOutput1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcnew 0 2>&1 | awk -f ${TESTSRC}/gcNewOutput1.awk

3
test/jdk/sun/tools/jstat/jstatGcOldCapacityOutput1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcoldcapacity 0 2>&1 | awk -f ${TESTSRC}/gcOldCapacityOutput1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcoldcapacity 0 2>&1 | awk -f ${TESTSRC}/gcOldCapacityOutput1.awk

3
test/jdk/sun/tools/jstat/jstatGcOldOutput1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcold 0 2>&1 | awk -f ${TESTSRC}/gcOldOutput1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcold 0 2>&1 | awk -f ${TESTSRC}/gcOldOutput1.awk

3
test/jdk/sun/tools/jstat/jstatGcOutput1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gc 0 2>&1 | awk -f ${TESTSRC}/gcOutput1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gc 0 2>&1 | awk -f ${TESTSRC}/gcOutput1.awk

3
test/jdk/sun/tools/jstat/jstatLineCounts1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcutil 0 250 5 2>&1 | awk -f ${TESTSRC}/lineCounts1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcutil 0 250 5 2>&1 | awk -f ${TESTSRC}/lineCounts1.awk

3
test/jdk/sun/tools/jstat/jstatLineCounts2.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcutil 0 2>&1 | awk -f ${TESTSRC}/lineCounts2.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcutil 0 2>&1 | awk -f ${TESTSRC}/lineCounts2.awk

3
test/jdk/sun/tools/jstat/jstatLineCounts3.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcutil -h 10 0 250 10 2>&1 | awk -f ${TESTSRC}/lineCounts3.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcutil -h 10 0 250 10 2>&1 | awk -f ${TESTSRC}/lineCounts3.awk

3
test/jdk/sun/tools/jstat/jstatLineCounts4.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcutil -h 10 0 250 11 2>&1 | awk -f ${TESTSRC}/lineCounts4.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcutil -h 10 0 250 11 2>&1 | awk -f ${TESTSRC}/lineCounts4.awk

3
test/jdk/sun/tools/jstat/jstatTimeStamp1.sh

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2020, 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
@ -34,3 +34,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcutil -t 0 2>&1 | awk -f ${TESTSRC}/timeStamp1.awk
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcutil -t 0 2>&1 | awk -f ${TESTSRC}/timeStamp1.awk

27
test/jdk/sun/tools/jstat/lineCounts1.awk

@ -3,22 +3,33 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# 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
# -gcutil 0 250 5
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 64.15 0.00 0.00 95.71 84.70 5 0.258 0 0.000 0 0.000 0.258
# 0.00 64.15 0.00 0.00 95.71 84.70 5 0.258 0 0.000 0 0.000 0.258
# 0.00 64.15 0.00 0.00 95.71 84.70 5 0.258 0 0.000 0 0.000 0.258
# 0.00 64.15 0.00 0.00 95.71 84.70 5 0.258 0 0.000 0 0.000 0.258
# 0.00 64.15 0.00 0.00 95.71 84.70 5 0.258 0 0.000 0 0.000 0.258
#
# -J-XX:+UseParallelGC -gcutil 0 250 5
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 100.00 46.54 14.99 94.73 89.25 5 0.197 0 0.000 - - 0.197
# 0.00 100.00 46.54 14.99 94.73 89.25 5 0.197 0 0.000 - - 0.197
# 0.00 100.00 48.50 14.99 94.73 89.25 5 0.197 0 0.000 - - 0.197
# 0.00 100.00 48.50 14.99 94.73 89.25 5 0.197 0 0.000 - - 0.197
# 0.00 100.00 50.46 14.99 94.73 89.25 5 0.197 0 0.000 - - 0.197
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT 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]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}

15
test/jdk/sun/tools/jstat/lineCounts2.awk

@ -3,18 +3,25 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# 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
# -gcutil 0
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 66.43 0.00 0.00 95.69 84.70 5 0.251 0 0.000 0 0.000 0.251
#
# -J-XX:+UseParallelGC -gcutil 0
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 100.00 46.41 14.85 95.00 89.25 5 0.151 0 0.000 - - 0.151
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT 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]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}

42
test/jdk/sun/tools/jstat/lineCounts3.awk

@ -3,27 +3,43 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# 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
# -gcutil -h 10 0 250 10
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
# 0.00 63.87 0.00 0.00 95.70 84.70 5 0.229 0 0.000 0 0.000 0.229
#
# -J-XX:+UseParallelGC -gcutil -h 10 0 250 10
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 100.00 46.46 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
# 0.00 100.00 46.46 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
# 0.00 100.00 48.42 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
# 0.00 100.00 48.42 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
# 0.00 100.00 50.39 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
# 0.00 100.00 50.39 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
# 0.00 100.00 52.35 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
# 0.00 100.00 52.35 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
# 0.00 100.00 54.31 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
# 0.00 100.00 54.31 15.06 95.02 89.25 5 0.219 0 0.000 - - 0.219
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT 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]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}

48
test/jdk/sun/tools/jstat/lineCounts4.awk

@ -3,30 +3,48 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
# 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
# -gcutil -h 10 0 250 11
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 0.00 57.14 47.16 97.09 92.27 5 0.283 51 23.751 2 0.068 24.102
#
# -J-XX:+UseParallelGC -gcutil -h 10 0 250 11
#
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 100.00 46.57 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# 0.00 100.00 46.57 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# 0.00 100.00 48.53 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# 0.00 100.00 48.53 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# 0.00 100.00 50.49 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# 0.00 100.00 50.49 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# 0.00 100.00 52.45 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# 0.00 100.00 52.45 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# 0.00 100.00 54.41 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# 0.00 100.00 54.41 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
# S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 0.00 100.00 56.37 14.56 94.70 89.25 5 0.206 0 0.000 - - 0.206
BEGIN {
headerlines=0; datalines=0; totallines=0
datalines2=0;
}
/^ S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT 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]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
if (headerlines == 2) {
datalines2++;
}

15
test/jdk/sun/tools/jstat/timeStamp1.awk

@ -3,15 +3,22 @@
# that the numerical values conform to a specific pattern, rather than
# specific values.
#
#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
# 0.3 0.00 0.00 37.50 0.00 - - 0 0.000 0 0.000 0 0.000 0.000
# -gcutil -t 0
#
#Timestamp S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 3.4 0.00 63.85 0.00 0.00 93.83 81.78 5 0.203 0 0.000 0 0.000 0.203
# 3.7 0.00 63.85 0.00 0.00 93.83 81.78 5 0.203 0 0.000 0 0.000 0.203
#
# -J-XX:+UseParallelGC -gcutil -t 0
#
#Timestamp S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
# 2.6 100.00 0.00 22.51 10.16 94.74 88.88 4 0.100 0 0.000 - - 0.100
BEGIN {
headerlines=0; datalines=0; totallines=0
}
/^Timestamp S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT $/ {
/^Timestamp S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT $/ {
headerlines++;
}

7
test/jdk/sun/tools/jstatd/JstatGCUtilParser.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2020, 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
@ -30,9 +30,8 @@ import jdk.test.lib.Utils;
/**
* The helper class for parsing following output from command 'jstat -gcutil':
*
* S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
* 0.00 0.00 86.67 0.00 - - 0 0.000 0 0.000 0 0.000 0.000
* 0.00 0.00 86.67 0.00 - - 0 0.000 0 0.000 0 0.000 0.000
* S0 S1 E O M CCS YGC YGCT FGC FGCT CGC CGCT GCT
* 0.00 0.00 0.00 52.39 97.76 92.71 4 0.286 28 28.006 2 0.086 28.378
*
* It will be verified that numerical values have defined types and are reasonable,
* for example percentage should fit within 0-100 interval.