From 9ccf8ad91f02ded8ff0f48f4c6287a8d6e4aa160 Mon Sep 17 00:00:00 2001 From: Thomas Stuefe Date: Wed, 15 Feb 2023 06:36:16 +0000 Subject: [PATCH] 8302129: Make MetaspaceReclaimPolicy a diagnostic switch Reviewed-by: dholmes, coleenp --- src/hotspot/share/runtime/globals.hpp | 2 +- test/hotspot/jtreg/gtest/MetaspaceGtests.java | 10 +++++----- .../jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index 13885794a9c..94025cc4353 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -1420,7 +1420,7 @@ const int ObjectAlignmentInBytes = 8; "Force the class space to be allocated at this address or " \ "fails VM initialization (requires -Xshare=off.") \ \ - product(ccstr, MetaspaceReclaimPolicy, "balanced", \ + product(ccstr, MetaspaceReclaimPolicy, "balanced", DIAGNOSTIC, \ "options: balanced, aggressive, none") \ \ product(bool, PrintMetaspaceStatisticsAtExit, false, DIAGNOSTIC, \ diff --git a/test/hotspot/jtreg/gtest/MetaspaceGtests.java b/test/hotspot/jtreg/gtest/MetaspaceGtests.java index 75cb7fe52fc..20b358a9d01 100644 --- a/test/hotspot/jtreg/gtest/MetaspaceGtests.java +++ b/test/hotspot/jtreg/gtest/MetaspaceGtests.java @@ -37,7 +37,7 @@ * java.xml * @requires vm.debug * @requires vm.flagless - * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:MetaspaceReclaimPolicy=none -XX:VerifyMetaspaceInterval=3 + * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:+UnlockDiagnosticVMOptions -XX:MetaspaceReclaimPolicy=none -XX:VerifyMetaspaceInterval=3 */ /* @test id=reclaim-none-ndebug @@ -48,7 +48,7 @@ * java.xml * @requires vm.debug == false * @requires vm.flagless - * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:MetaspaceReclaimPolicy=none + * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:+UnlockDiagnosticVMOptions -XX:MetaspaceReclaimPolicy=none */ @@ -62,7 +62,7 @@ * java.xml * @requires vm.debug * @requires vm.flagless - * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:MetaspaceReclaimPolicy=aggressive -XX:VerifyMetaspaceInterval=3 + * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:+UnlockDiagnosticVMOptions -XX:MetaspaceReclaimPolicy=aggressive -XX:VerifyMetaspaceInterval=3 */ /* @test id=reclaim-aggressive-ndebug @@ -73,7 +73,7 @@ * java.xml * @requires vm.debug == false * @requires vm.flagless - * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:MetaspaceReclaimPolicy=aggressive + * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:+UnlockDiagnosticVMOptions -XX:MetaspaceReclaimPolicy=aggressive */ @@ -99,5 +99,5 @@ * java.xml * @requires vm.bits == 64 * @requires vm.flagless - * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:MetaspaceReclaimPolicy=balanced -XX:-UseCompressedClassPointers + * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:+UnlockDiagnosticVMOptions -XX:MetaspaceReclaimPolicy=balanced -XX:-UseCompressedClassPointers */ diff --git a/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java b/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java index d90a49a0adb..1eabb4ff6f3 100644 --- a/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java +++ b/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java @@ -43,7 +43,7 @@ import jdk.test.lib.JDKToolFinder; * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @run main/othervm -Dwith-compressed-class-space -XX:MaxMetaspaceSize=201M -Xmx100M -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:MetaspaceReclaimPolicy=none PrintMetaspaceDcmd + * @run main/othervm -Dwith-compressed-class-space -XX:MaxMetaspaceSize=201M -Xmx100M -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UnlockDiagnosticVMOptions -XX:MetaspaceReclaimPolicy=none PrintMetaspaceDcmd */ /* @@ -53,7 +53,7 @@ import jdk.test.lib.JDKToolFinder; * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @run main/othervm -Dwith-compressed-class-space -XX:MaxMetaspaceSize=201M -Xmx100M -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:MetaspaceReclaimPolicy=aggressive PrintMetaspaceDcmd + * @run main/othervm -Dwith-compressed-class-space -XX:MaxMetaspaceSize=201M -Xmx100M -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UnlockDiagnosticVMOptions -XX:MetaspaceReclaimPolicy=aggressive PrintMetaspaceDcmd */ /*