7005984: 3/3 Incorrect values of S0C and S0CMX appear with -gcnewcapacity in jstat
Summary: Swap S0C and S0CMX column values.
Reviewed-by: ohair, dholmes, poonam
--- a/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options Thu Dec 23 13:51:30 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options Thu Dec 23 23:10:36 2010 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
@@ -589,7 +589,7 @@
}
column {
header "^S0CMX^" /* Survivor 0 Space Capacity - Maximum */
- data sun.gc.generation.0.space.1.capacity
+ data sun.gc.generation.0.space.1.maxCapacity
scale K
align right
width 8
@@ -597,7 +597,7 @@
}
column {
header "^S0C^" /* Survivor 0 Space Capacity - Current */
- data sun.gc.generation.0.space.1.maxCapacity
+ data sun.gc.generation.0.space.1.capacity
scale K
align right
width 8
--- a/jdk/test/sun/tools/jstat/gcNewCapacityOutput1.awk Thu Dec 23 13:51:30 2010 -0800
+++ b/jdk/test/sun/tools/jstat/gcNewCapacityOutput1.awk Thu Dec 23 23:10:36 2010 -0800
@@ -4,7 +4,7 @@
# specific values.
#
# NGCMN NGCMX NGC S0CMX S0C S1CMX S1C ECMX EC YGC FGC
-# 2176.0 7232.0 2176.0 64.0 192.0 192.0 64.0 6848.0 2048.0 1 0
+# 2176.0 7232.0 2176.0 192.0 64.0 192.0 64.0 6848.0 2048.0 1 0
BEGIN {