diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp index 2531ecb2d5c..64d3a8d4a10 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp @@ -102,7 +102,6 @@ jint ParallelScavengeHeap::initialize() { assert(old_gen()->max_gen_size() == old_rs.size(), "Consistency check"); double max_gc_pause_sec = ((double) MaxGCPauseMillis)/1000.0; - double max_gc_minor_pause_sec = ((double) MaxGCMinorPauseMillis)/1000.0; const size_t eden_capacity = _young_gen->eden_space()->capacity_in_bytes(); const size_t old_capacity = _old_gen->capacity_in_bytes(); @@ -113,7 +112,6 @@ jint ParallelScavengeHeap::initialize() { young_gen()->to_space()->capacity_in_bytes(), GenAlignment, max_gc_pause_sec, - max_gc_minor_pause_sec, GCTimeRatio ); diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp index 15287437cff..c8a15c2cb92 100644 --- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp +++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp @@ -41,7 +41,6 @@ PSAdaptiveSizePolicy::PSAdaptiveSizePolicy(size_t init_eden_size, size_t init_survivor_size, size_t space_alignment, double gc_pause_goal_sec, - double gc_minor_pause_goal_sec, uint gc_cost_ratio) : AdaptiveSizePolicy(init_eden_size, init_promo_size, @@ -55,7 +54,6 @@ PSAdaptiveSizePolicy::PSAdaptiveSizePolicy(size_t init_eden_size, _major_pause_young_estimator(new LinearLeastSquareFit(AdaptiveSizePolicyWeight)), _latest_major_mutator_interval_seconds(0), _space_alignment(space_alignment), - _gc_minor_pause_goal_sec(gc_minor_pause_goal_sec), _live_at_last_full_gc(init_promo_size), _change_old_gen_for_min_pauses(0), _change_young_gen_for_maj_pauses(0), @@ -282,7 +280,7 @@ void PSAdaptiveSizePolicy::compute_eden_space_size( // at a time. adjust_eden_for_pause_time(&desired_eden_size); - } else if (_avg_minor_pause->padded_average() > gc_minor_pause_goal_sec()) { + } else if (_avg_minor_pause->padded_average() > gc_pause_goal_sec()) { // Adjust only for the minor pause time goal adjust_eden_for_minor_pause_time(&desired_eden_size); diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp index f6d4be029fb..997a4784667 100644 --- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp +++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp @@ -91,8 +91,6 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy { const size_t _space_alignment; // alignment for eden, survivors - const double _gc_minor_pause_goal_sec; // goal for maximum minor gc pause - // The amount of live data in the heap at the last full GC, used // as a baseline to help us determine when we need to perform the // next full GC. @@ -113,9 +111,6 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy { private: - // Accessors - double gc_minor_pause_goal_sec() const { return _gc_minor_pause_goal_sec; } - void adjust_eden_for_minor_pause_time(size_t* desired_eden_size_ptr); // Change the generation sizes to achieve a GC pause time goal // Returned sizes are not necessarily aligned. @@ -187,7 +182,6 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy { size_t init_survivor_size, size_t space_alignment, double gc_pause_goal_sec, - double gc_minor_pause_goal_sec, uint gc_time_ratio); // Methods indicating events of interest to the adaptive size policy, diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp index ae8674c84a9..74fa47ebc9a 100644 --- a/src/hotspot/share/gc/shared/gc_globals.hpp +++ b/src/hotspot/share/gc/shared/gc_globals.hpp @@ -442,11 +442,6 @@ "Time slice for MMU specification") \ constraint(GCPauseIntervalMillisConstraintFunc,AfterErgo) \ \ - product(uintx, MaxGCMinorPauseMillis, max_uintx, \ - "Adaptive size policy maximum GC minor pause time goal " \ - "in millisecond") \ - range(0, max_uintx) \ - \ product(uint, GCTimeRatio, 99, \ "Adaptive size policy application time to GC time ratio") \ range(0, UINT_MAX) \ diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index 7dae2cce16e..76877db2903 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -494,7 +494,6 @@ void Arguments::init_version_specific_system_properties() { static SpecialFlag const special_jvm_flags[] = { // -------------- Deprecated Flags -------------- // --- Non-alias flags - sorted by obsolete_in then expired_in: - { "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, { "MaxRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, { "MinRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, { "InitialRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, @@ -526,6 +525,7 @@ static SpecialFlag const special_jvm_flags[] = { { "MetaspaceReclaimPolicy", JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() }, { "AdaptiveSizePolicyCollectionCostMargin", JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) }, + { "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::jdk(23), JDK_Version::jdk(24) }, #ifdef ASSERT { "DummyObsoleteTestFlag", JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() }, #endif diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java index 95dd88c7223..b257f2400a6 100644 --- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java +++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java @@ -56,7 +56,6 @@ public class VMDeprecatedOptions { ArrayList deprecated = new ArrayList( Arrays.asList(new String[][] { // deprecated non-alias flags: - {"MaxGCMinorPauseMillis", "1032"}, {"MaxRAMFraction", "8"}, {"MinRAMFraction", "2"}, {"InitialRAMFraction", "64"},