From 4ef8c5c56c74cceb190ec145103fc8fef9b20b17 Mon Sep 17 00:00:00 2001 From: "Daniel D. Daugherty" Date: Thu, 23 Dec 2010 23:10:36 -0800 Subject: [PATCH] 7005984: 3/3 Incorrect values of S0C and S0CMX appear with -gcnewcapacity in jstat Swap S0C and S0CMX column values. Reviewed-by: ohair, dholmes, poonam --- .../share/classes/sun/tools/jstat/resources/jstat_options | 6 +++--- jdk/test/sun/tools/jstat/gcNewCapacityOutput1.awk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options b/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options index f339965e599..14a2d05e0ed 100644 --- a/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options +++ b/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options @@ -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 @@ option gcnewcapacity { } 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 @@ option gcnewcapacity { } 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 diff --git a/jdk/test/sun/tools/jstat/gcNewCapacityOutput1.awk b/jdk/test/sun/tools/jstat/gcNewCapacityOutput1.awk index b0587b70bed..0491fa52076 100644 --- a/jdk/test/sun/tools/jstat/gcNewCapacityOutput1.awk +++ b/jdk/test/sun/tools/jstat/gcNewCapacityOutput1.awk @@ -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 {