# HG changeset patch
# User jcbeyler
# Date 1536095865 25200
# Node ID 6ad495a34ac836deccc4740874229b5558724b38
# Parent  3f189f451ff1f3be8fa2fecf80f97f634743fa83
8210192: Hsperf counter ParNew::CMS should be ParNew:CMS
Summary: Rename the counter back to ParNew:CMS and added a test
Reviewed-by: sjohanss, tschatzl
Contributed-by: manc@google.com

diff -r 3f189f451ff1 -r 6ad495a34ac8 src/hotspot/share/gc/cms/cmsHeap.cpp
--- a/src/hotspot/share/gc/cms/cmsHeap.cpp	Fri Aug 31 22:55:34 2018 -0700
+++ b/src/hotspot/share/gc/cms/cmsHeap.cpp	Tue Sep 04 14:17:45 2018 -0700
@@ -69,7 +69,7 @@
     GenCollectedHeap(policy,
                      Generation::ParNew,
                      Generation::ConcurrentMarkSweep,
-                     "ParNew::CMS"),
+                     "ParNew:CMS"),
     _eden_pool(NULL),
     _survivor_pool(NULL),
     _old_pool(NULL) {
diff -r 3f189f451ff1 -r 6ad495a34ac8 test/hotspot/jtreg/gc/TestPolicyNamePerfCounter.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/gc/TestPolicyNamePerfCounter.java	Tue Sep 04 14:17:45 2018 -0700
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static jdk.test.lib.Asserts.*;
+import gc.testlibrary.PerfCounter;
+import gc.testlibrary.PerfCounters;
+
+
+/* @test TestPolicyNamePerfCounter
+ * @bug 8210192
+ * @requires vm.gc=="null"
+ * @library /test/lib /
+ * @summary Tests that sun.gc.policy.name returns expected values for different GCs.
+ * @modules java.base/jdk.internal.misc
+ *          java.compiler
+ *          java.management/sun.management
+ *          jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @run main/othervm -XX:+UsePerfData -XX:+UseSerialGC TestPolicyNamePerfCounter Copy:MSC
+ * @run main/othervm -XX:+UsePerfData -XX:+UseParallelGC TestPolicyNamePerfCounter ParScav:MSC
+ * @run main/othervm -XX:+UsePerfData -XX:+UseG1GC TestPolicyNamePerfCounter GarbageFirst
+ */
+
+/* @test TestPolicyNamePerfCounterCMS
+ * @bug 8210192
+ * @comment Graal does not support CMS
+ * @requires vm.gc=="null" & !vm.graal.enabled
+ * @library /test/lib /
+ * @summary Tests that sun.gc.policy.name returns expected values for different GCs.
+ * @modules java.base/jdk.internal.misc
+ *          java.compiler
+ *          java.management/sun.management
+ *          jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @run main/othervm -XX:+UsePerfData -XX:+UseConcMarkSweepGC TestPolicyNamePerfCounter ParNew:CMS
+ */
+
+public class TestPolicyNamePerfCounter {
+    public static void main(String[] args) throws Exception {
+        if (args.length != 1) {
+            throw new IllegalArgumentException("Expected 1 arg: <expectedName>");
+        }
+        assertEQ(PerfCounters.findByName("sun.gc.policy.name").value(), args[0]);
+    }
+}
diff -r 3f189f451ff1 -r 6ad495a34ac8 test/hotspot/jtreg/gc/testlibrary/PerfCounter.java
--- a/test/hotspot/jtreg/gc/testlibrary/PerfCounter.java	Fri Aug 31 22:55:34 2018 -0700
+++ b/test/hotspot/jtreg/gc/testlibrary/PerfCounter.java	Tue Sep 04 14:17:45 2018 -0700
@@ -41,6 +41,15 @@
     }
 
     /**
+     * Returns the value of this performance counter as an Object.
+     *
+     * @return The value of this performance counter
+     */
+    public Object value() {
+        return monitor.getValue();
+    }
+
+    /**
      * Returns the value of this performance counter as a long.
      *
      * @return The long value of this performance counter