8239533: ZGC: Make the ZProactive flag non-diagnostic

Reviewed-by: eosterlund, stefank
openjdk · Feb 24, 2020 · aab0ce5 · aab0ce5
1 parent 289513c
commit aab0ce5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/hotspot/share/gc/z/z_globals.hpp b/src/hotspot/share/gc/z/z_globals.hpp
@@ -51,6 +51,9 @@
   experimental(uint, ZCollectionInterval, 0,                                \
           "Force GC at a fixed time interval (in seconds)")                 \
                                                                             \
+  experimental(bool, ZProactive, true,                                      \
+          "Enable proactive GC cycles")                                     \
+                                                                            \
   experimental(bool, ZUncommit, true,                                       \
           "Uncommit unused memory")                                         \
                                                                             \
@@ -62,9 +65,6 @@
           "Time between statistics print outs (in seconds)")                \
           range(1, (uint)-1)                                                \
                                                                             \
-  diagnostic(bool, ZProactive, true,                                        \
-          "Enable proactive GC cycles")                                     \
-                                                                            \
   diagnostic(bool, ZVerifyViews, false,                                     \
           "Verify heap view accesses")                                      \
                                                                             \

diff --git a/test/hotspot/jtreg/gc/z/TestHighUsage.java b/test/hotspot/jtreg/gc/z/TestHighUsage.java
@@ -87,7 +87,6 @@ public static void main(String[] args) throws Exception {
     public static void main(String[] args) throws Exception {
         ProcessTools.executeTestJvm(new String[]{ "-XX:+UnlockExperimentalVMOptions",
                                                   "-XX:+UseZGC",
-                                                  "-XX:+UnlockDiagnosticVMOptions",
                                                   "-XX:-ZProactive",
                                                   "-Xms128M",
                                                   "-Xmx128M",