From fe7abefdd3ea5235484ae5c81c6513ee532a8db3 Mon Sep 17 00:00:00 2001 From: Jenny Shivayogi Date: Thu, 20 Jul 2023 12:15:51 -0700 Subject: [PATCH] moving ParallelGCThreadsConstraintFuncParallel to gc/shared after CMS removal --- .../parallel/jvmFlagConstraintsParallel.cpp | 14 -------------- .../parallel/jvmFlagConstraintsParallel.hpp | 1 - .../share/gc/shared/jvmFlagConstraintsGC.cpp | 19 ++++++++++--------- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp index 047b6a889ca33..99c795341df8d 100644 --- a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp +++ b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp @@ -28,20 +28,6 @@ #include "runtime/globals.hpp" #include "utilities/globalDefinitions.hpp" -JVMFlag::Error ParallelGCThreadsConstraintFuncParallel(uint value, bool verbose) { - // Parallel GC passes ParallelGCThreads when creating GrowableArray as 'int' type parameter. - // So can't exceed with "max_jint" - - if (UseParallelGC && (value > (uint)max_jint)) { - JVMFlag::printError(verbose, - "ParallelGCThreads (" UINT32_FORMAT ") must be " - "less than or equal to " UINT32_FORMAT " for Parallel GC\n", - value, max_jint); - return JVMFlag::VIOLATES_CONSTRAINT; - } - return JVMFlag::SUCCESS; -} - JVMFlag::Error InitialTenuringThresholdConstraintFuncParallel(uint value, bool verbose) { // InitialTenuringThreshold is only used for ParallelGC. if (UseParallelGC && (value > MaxTenuringThreshold)) { diff --git a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp index d10bdfe373050..53255c35ef2c5 100644 --- a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp +++ b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp @@ -30,7 +30,6 @@ // Parallel Subconstraints #define PARALLEL_GC_CONSTRAINTS(f) \ - f(uint, ParallelGCThreadsConstraintFuncParallel) \ f(uint, InitialTenuringThresholdConstraintFuncParallel) \ f(uint, MaxTenuringThresholdConstraintFuncParallel) diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp index ce4d7247f4d4e..9a7cd898d0461 100644 --- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp +++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp @@ -53,18 +53,19 @@ // checking functions, FLAG_IS_CMDLINE() is used to check if // the flag has been set by the user and so should be checked. -// As ParallelGCThreads differs among GC modes, we need constraint function. +// (earlier ParallelGCThreadConstraintsFuncParallel) replaced after CMS is removed JVMFlag::Error ParallelGCThreadsConstraintFunc(uint value, bool verbose) { - JVMFlag::Error status = JVMFlag::SUCCESS; + // Parallel GC passes ParallelGCThreads when creating GrowableArray as 'int' type parameter. + // So can't exceed with "max_jint" -#if INCLUDE_PARALLELGC - status = ParallelGCThreadsConstraintFuncParallel(value, verbose); - if (status != JVMFlag::SUCCESS) { - return status; + if (UseParallelGC && (value > (uint)max_jint)) { + JVMFlag::printError(verbose, + "ParallelGCThreads (" UINT32_FORMAT ") must be " + "less than or equal to " UINT32_FORMAT " for Parallel GC\n", + value, max_jint); + return JVMFlag::VIOLATES_CONSTRAINT; } -#endif - - return status; + return JVMFlag::SUCCESS; } static JVMFlag::Error MinPLABSizeBounds(const char* name, size_t value, bool verbose) {