Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 0a867860 编写于 作者: S stefank
浏览文件
操作

8004172: Update jstat counter names to reflect metaspace changes 

Reviewed-by: mchung
Contributed-by: NErik Helin <erik.helin@oracle.com>
上级 c23c20c2
隐藏空白更改
内联 并排
Showing with 55 addition and 71 deletion
src/share/classes/sun/tools/jstat/resources/jstat_options
浏览文件 @ 0a867860
...@@ -192,16 +192,16 @@ option gc { ...@@ -192,16 +192,16 @@ option gc {
format "0.0" format "0.0"
} }
column { column {
header "^PC^" /* Perm Space Capacity - Current */ header "^MC^" /* Metaspace Capacity - Current */
data sun.gc.generation.2.space.0.capacity data sun.gc.metaspace.capacity
align center align center
width 6 width 6
scale K scale K
format "0.0" format "0.0"
} }
column { column {
header "^PU^" /* Perm Space Used */ header "^MU^" /* Metaspae Used */
data sun.gc.generation.2.space.0.used data sun.gc.metaspace.used
align center align center
width 6 width 6
scale K scale K
...@@ -330,32 +330,24 @@ option gccapacity { ...@@ -330,32 +330,24 @@ option gccapacity {
format "0.0" format "0.0"
} }
column { column {
header "^PGCMN^" /* Perm Generation Capacity - Minimum */ header "^MCMN^" /* Metaspace Capacity - Minimum */
data sun.gc.generation.2.minCapacity data sun.gc.metaspace.minCapacity
scale K scale K
align right align right
width 8 width 8
format "0.0" format "0.0"
} }
column { column {
header "^PGCMX^" /* Perm Generation Capacity - Maximum */ header "^MCMX^" /* Metaspace Capacity - Maximum */
data sun.gc.generation.2.maxCapacity data sun.gc.metaspace.maxCapacity
scale K scale K
align right align right
width 8 width 8
format "0.0" format "0.0"
} }
column { column {
header "^PGC^" /* Perm Generation Capacity - Current */ header "^MC^" /* Metaspace Capacity - Current */
data sun.gc.generation.2.capacity data sun.gc.metaspace.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
scale K scale K
align right align right
width 8 width 8
...@@ -412,8 +404,8 @@ option gccause { ...@@ -412,8 +404,8 @@ option gccause {
format "0.00" format "0.00"
} }
column { column {
header "^P^" /* Perm Space - Percent Used */ header "^M^" /* Metaspace - 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 data (1-((sun.gc.metaspace.capacity - sun.gc.metaspace.used)/sun.gc.metaspace.capacity)) * 100
align right align right
width 6 width 6
scale raw scale raw
...@@ -654,16 +646,16 @@ option gcnewcapacity { ...@@ -654,16 +646,16 @@ option gcnewcapacity {
option gcold { option gcold {
column { column {
header "^PC^" /* Perm Space Capacity - Current */ header "^MC^" /* Metaspace Capacity - Current */
data sun.gc.generation.2.space.0.capacity data sun.gc.metaspace.capacity
width 8 width 8
align right align right
scale K scale K
format "0.0" format "0.0"
} }
column { column {
header "^PU^" /* Perm Space Used */ header "^MU^" /* Metaspace Space Used */
data sun.gc.generation.2.space.0.used data sun.gc.metaspace.used
width 8 width 8
align right align right
scale K scale K
...@@ -784,34 +776,26 @@ option gcoldcapacity { ...@@ -784,34 +776,26 @@ option gcoldcapacity {
} }
} }
option gcpermcapacity { option gcmetacapacity {
column {
header "^PGCMN^" /* Perm Generation Capacity - Minumum */
data sun.gc.generation.2.minCapacity
scale K
align right
width 10
format "0.0"
}
column { column {
header "^PGCMX^" /* Perm Generation Capacity - Maximum */ header "^MCMN^" /* Metaspace Capacity - Minimum */
data sun.gc.generation.2.maxCapacity data sun.gc.metaspace.minCapacity
scale K scale K
align right align right
width 10 width 10
format "0.0" format "0.0"
} }
column { column {
header "^PGC^" /* Perm Generation Capacity - Current */ header "^MCMX^" /* Metaspace Capacity - Maximum */
data sun.gc.generation.2.capacity data sun.gc.metaspace.maxCapacity
scale K scale K
align right align right
width 10 width 10
format "0.0" format "0.0"
} }
column { column {
header "^PC^" /* Perm Space Capacity - Current */ header "^MC^" /* Metaspace Capacity - Current */
data sun.gc.generation.2.space.0.capacity data sun.gc.metaspace.capacity
scale K scale K
align right align right
width 10 width 10
...@@ -884,8 +868,8 @@ option gcutil { ...@@ -884,8 +868,8 @@ option gcutil {
format "0.00" format "0.00"
} }
column { column {
header "^P^" /* Perm Space - Percent Used */ header "^M^" /* Metaspace 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 data (1-((sun.gc.metaspace.capacity - sun.gc.metaspace.used)/sun.gc.metaspace.capacity)) * 100
align right align right
width 6 width 6
scale raw scale raw
......
test/sun/tools/jstat/gcCapacityOutput1.awk
浏览文件 @ 0a867860
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC PGCMN PGCMX PGC PC YGC FGC # NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC YGC FGC
# 2176.0 7232.0 2176.0 64.0 64.0 2048.0 6016.0 58304.0 6016.0 6016.0 8192.0 65536.0 8192.0 8192.0 0 0 # 2176.0 7232.0 2176.0 64.0 64.0 2048.0 6016.0 58304.0 6016.0 6016.0 8192.0 65536.0 8192.0 8192.0 0
BEGIN { BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^ NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC PGCMN PGCMX PGC PC YGC FGC $/ { /^ NGCMN NGCMX NGC S0C S1C EC OGCMN OGCMX OGC OC MCMN MCMX MC YGC FGC $/ {
headerlines++; 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]+$/ {
datalines++; datalines++;
} }
......
test/sun/tools/jstat/gcCauseOutput1.awk
浏览文件 @ 0a867860
...@@ -11,7 +11,7 @@ BEGIN { ...@@ -11,7 +11,7 @@ BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^ S0 S1 E O P YGC YGCT FGC FGCT GCT LGCC GCC $/ { /^ S0 S1 E O M YGC YGCT FGC FGCT GCT LGCC GCC $/ {
headerlines++; headerlines++;
} }
......
test/sun/tools/jstat/gcPermCapacityOutput1.awk → test/sun/tools/jstat/gcMetaCapacityOutput1.awk
浏览文件 @ 0a867860
...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# PGCMN PGCMX PGC PC YGC FGC FGCT GCT # MCMN MCMX MC YGC FGC FGCT GCT
# 8192.0 65536.0 8192.0 8192.0 1 0 0.000 0.029 # 8192.0 65536.0 8192.0 8192.0 1 0 0.000 0.029
BEGIN { BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^ PGCMN PGCMX PGC PC YGC FGC FGCT GCT $/ { /^ MCMN MCMX MC YGC FGC FGCT GCT $/ {
headerlines++; 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]+$/ {
datalines++; datalines++;
} }
......
test/sun/tools/jstat/gcOldOutput1.awk
浏览文件 @ 0a867860
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# PC PU OC OU YGC FGC FGCT GCT # MC MU OC OU YGC FGC FGCT GCT
# 8192.0 1877.3 6016.0 180.8 1 0 0.000 0.030 # 8192.0 1877.3 6016.0 180.8 1 0 0.000 0.030
...@@ -11,7 +11,7 @@ BEGIN { ...@@ -11,7 +11,7 @@ BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^ PC PU OC OU YGC FGC FGCT GCT $/ { /^ MC MU OC OU YGC FGC FGCT GCT $/ {
headerlines++; headerlines++;
} }
......
test/sun/tools/jstat/gcOutput1.awk
浏览文件 @ 0a867860
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# S0C S1C S0U S1U EC EU OC OU PC PU YGC YGCT FGC FGCT GCT # S0C S1C S0U S1U EC EU OC OU MC MU YGC YGCT FGC FGCT GCT
# 64.0 64.0 0.0 0.0 2048.0 1711.2 6016.0 0.0 8192.0 1948.6 0 0.000 0 0.000 0.000 # 64.0 64.0 0.0 0.0 2048.0 1711.2 6016.0 0.0 8192.0 1948.6 0 0.000 0 0.000 0.000
...@@ -11,7 +11,7 @@ BEGIN { ...@@ -11,7 +11,7 @@ BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^ S0C S1C S0U S1U EC EU OC OU PC PU YGC YGCT FGC FGCT GCT $/ { /^ S0C S1C S0U S1U EC EU OC OU MC MU YGC YGCT FGC FGCT GCT $/ {
headerlines++; headerlines++;
} }
......
test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh → test/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh
浏览文件 @ 0a867860
# #
# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
# @test # @test
# @bug 4990825 # @bug 4990825
# @run shell jstatGcPermCapacityOutput1.sh # @run shell jstatGcMetaCapacityOutput1.sh
# @summary Test that output of 'jstat -gcpermcapcaity 0' has expected line counts # @summary Test that output of 'jstat -gcmetacapacity 0' has expected line counts
. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
...@@ -33,4 +33,4 @@ verify_os ...@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat" JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcpermcapacity 0 2>&1 | awk -f ${TESTSRC}/gcPermCapacityOutput1.awk ${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcmetacapacity 0 2>&1 | awk -f ${TESTSRC}/gcMetaCapacityOutput1.awk
test/sun/tools/jstat/lineCounts1.awk
浏览文件 @ 0a867860
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# S0 S1 E O P YGC YGCT FGC FGCT GCT # S0 S1 E O M YGC YGCT FGC FGCT GCT
# 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044 # 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044
# 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044 # 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044
# 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044 # 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044
...@@ -14,7 +14,7 @@ BEGIN { ...@@ -14,7 +14,7 @@ BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^ S0 S1 E O P YGC YGCT FGC FGCT GCT $/ { /^ S0 S1 E O M YGC YGCT FGC FGCT GCT $/ {
headerlines++; headerlines++;
} }
......
test/sun/tools/jstat/lineCounts2.awk
浏览文件 @ 0a867860
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# S0 S1 E O P YGC YGCT FGC FGCT GCT # S0 S1 E O M YGC YGCT FGC FGCT GCT
# 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044 # 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044
BEGIN { BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^ S0 S1 E O P YGC YGCT FGC FGCT GCT $/ { /^ S0 S1 E O M YGC YGCT FGC FGCT GCT $/ {
headerlines++; headerlines++;
} }
......
test/sun/tools/jstat/lineCounts3.awk
浏览文件 @ 0a867860
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# S0 S1 E O P YGC YGCT FGC FGCT GCT # S0 S1 E O M YGC YGCT FGC FGCT GCT
# 0.00 99.99 66.81 1.24 26.55 1 0.028 0 0.000 0.028 # 0.00 99.99 66.81 1.24 26.55 1 0.028 0 0.000 0.028
# 0.00 99.99 68.81 1.24 27.84 1 0.028 0 0.000 0.028 # 0.00 99.99 68.81 1.24 27.84 1 0.028 0 0.000 0.028
# 0.00 99.99 70.81 1.24 27.84 1 0.028 0 0.000 0.028 # 0.00 99.99 70.81 1.24 27.84 1 0.028 0 0.000 0.028
...@@ -19,7 +19,7 @@ BEGIN { ...@@ -19,7 +19,7 @@ BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^ S0 S1 E O P YGC YGCT FGC FGCT GCT $/ { /^ S0 S1 E O M YGC YGCT FGC FGCT GCT $/ {
headerlines++; headerlines++;
} }
......
test/sun/tools/jstat/lineCounts4.awk
浏览文件 @ 0a867860
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# S0 S1 E O P YGC YGCT FGC FGCT GCT # S0 S1 E O M YGC YGCT FGC FGCT GCT
# 0.00 99.99 66.81 1.24 26.55 1 0.028 0 0.000 0.028 # 0.00 99.99 66.81 1.24 26.55 1 0.028 0 0.000 0.028
# 0.00 99.99 68.81 1.24 27.84 1 0.028 0 0.000 0.028 # 0.00 99.99 68.81 1.24 27.84 1 0.028 0 0.000 0.028
# 0.00 99.99 70.81 1.24 27.84 1 0.028 0 0.000 0.028 # 0.00 99.99 70.81 1.24 27.84 1 0.028 0 0.000 0.028
...@@ -22,7 +22,7 @@ BEGIN { ...@@ -22,7 +22,7 @@ BEGIN {
datalines2=0; datalines2=0;
} }
/^ S0 S1 E O P YGC YGCT FGC FGCT GCT $/ { /^ S0 S1 E O M YGC YGCT FGC FGCT GCT $/ {
headerlines++; headerlines++;
} }
......
test/sun/tools/jstat/options1.out
浏览文件 @ 0a867860
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
-gc -gc
-gccapacity -gccapacity
-gccause -gccause
-gcmetacapacity
-gcnew -gcnew
-gcnewcapacity -gcnewcapacity
-gcold -gcold
-gcoldcapacity -gcoldcapacity
-gcpermcapacity
-gcutil -gcutil
-printcompilation -printcompilation
test/sun/tools/jstat/options2.out
浏览文件 @ 0a867860
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
-gc -gc
-gccapacity -gccapacity
-gccause -gccause
-gcmetacapacity
-gcnew -gcnew
-gcnewcapacity -gcnewcapacity
-gcold -gcold
-gcoldcapacity -gcoldcapacity
-gcpermcapacity
-gcutil -gcutil
-printcompilation -printcompilation
test/sun/tools/jstat/timeStamp1.awk
浏览文件 @ 0a867860
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# S0 S1 E O P YGC YGCT FGC FGCT GCT # S0 S1 E O M YGC YGCT FGC FGCT GCT
# 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044 # 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044
BEGIN { BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^Timestamp S0 S1 E O P YGC YGCT FGC FGCT GCT $/ { /^Timestamp S0 S1 E O M YGC YGCT FGC FGCT GCT $/ {
headerlines++; headerlines++;
} }
......
test/sun/tools/jstatd/jstatGcutilOutput1.awk
浏览文件 @ 0a867860
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# that the numerical values conform to a specific pattern, rather than # that the numerical values conform to a specific pattern, rather than
# specific values. # specific values.
# #
# S0 S1 E O P YGC YGCT FGC FGCT GCT # S0 S1 E O M YGC YGCT FGC FGCT GCT
# 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044 # 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044
# 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044 # 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044
# 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044 # 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044
...@@ -14,7 +14,7 @@ BEGIN { ...@@ -14,7 +14,7 @@ BEGIN {
headerlines=0; datalines=0; totallines=0 headerlines=0; datalines=0; totallines=0
} }
/^ S0 S1 E O P YGC YGCT FGC FGCT GCT $/ { /^ S0 S1 E O M YGC YGCT FGC FGCT GCT $/ {
headerlines++; headerlines++;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或