From 732e97190d23c2eeb1512e0d9ce2dcb9c688d89c Mon Sep 17 00:00:00 2001 From: Albert Yang Date: Fri, 15 Dec 2023 19:28:53 +0100 Subject: [PATCH] pgc-remove-is-full --- .../gc/parallel/psAdaptiveSizePolicy.cpp | 27 +++++++++---------- .../gc/parallel/psAdaptiveSizePolicy.hpp | 7 ++--- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp index ed35bd8970dc8..22ea9cc4a1537 100644 --- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp +++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp @@ -280,11 +280,11 @@ void PSAdaptiveSizePolicy::compute_eden_space_size( // // Make changes only to affect one of the pauses (the larger) // at a time. - adjust_eden_for_pause_time(is_full_gc, &desired_promo_size, &desired_eden_size); + adjust_eden_for_pause_time(&desired_promo_size, &desired_eden_size); } else if (_avg_minor_pause->padded_average() > gc_minor_pause_goal_sec()) { // Adjust only for the minor pause time goal - adjust_eden_for_minor_pause_time(is_full_gc, &desired_eden_size); + adjust_eden_for_minor_pause_time(&desired_eden_size); } else if(adjusted_mutator_cost() < _throughput_goal) { // This branch used to require that (mutator_cost() > 0.0 in 1.4.2. @@ -570,9 +570,7 @@ void PSAdaptiveSizePolicy::decay_supplemental_growth(bool is_full_gc) { } } -void PSAdaptiveSizePolicy::adjust_eden_for_minor_pause_time(bool is_full_gc, - size_t* desired_eden_size_ptr) { - +void PSAdaptiveSizePolicy::adjust_eden_for_minor_pause_time(size_t* desired_eden_size_ptr) { // Adjust the young generation size to reduce pause time of // of collections. // @@ -585,12 +583,12 @@ void PSAdaptiveSizePolicy::adjust_eden_for_minor_pause_time(bool is_full_gc, decrease_young_gen_for_min_pauses_true); *desired_eden_size_ptr = *desired_eden_size_ptr - eden_decrement_aligned_down(*desired_eden_size_ptr); - } else { - // EXPERIMENTAL ADJUSTMENT - // Only record that the estimator indicated such an action. - // *desired_eden_size_ptr = *desired_eden_size_ptr + eden_heap_delta; - set_change_young_gen_for_min_pauses( - increase_young_gen_for_min_pauses_true); + } else { + // EXPERIMENTAL ADJUSTMENT + // Only record that the estimator indicated such an action. + // *desired_eden_size_ptr = *desired_eden_size_ptr + eden_heap_delta; + set_change_young_gen_for_min_pauses( + increase_young_gen_for_min_pauses_true); } } @@ -630,16 +628,15 @@ void PSAdaptiveSizePolicy::adjust_promo_for_pause_time(bool is_full_gc, *desired_promo_size_ptr, promo_heap_delta); } -void PSAdaptiveSizePolicy::adjust_eden_for_pause_time(bool is_full_gc, - size_t* desired_promo_size_ptr, - size_t* desired_eden_size_ptr) { +void PSAdaptiveSizePolicy::adjust_eden_for_pause_time(size_t* desired_promo_size_ptr, + size_t* desired_eden_size_ptr) { size_t eden_heap_delta = 0; // Add some checks for a threshold for a change. For example, // a change less than the required alignment is probably not worth // attempting. if (_avg_minor_pause->padded_average() > _avg_major_pause->padded_average()) { - adjust_eden_for_minor_pause_time(is_full_gc, desired_eden_size_ptr); + adjust_eden_for_minor_pause_time(desired_eden_size_ptr); } log_trace(gc, ergo)( "PSAdaptiveSizePolicy::adjust_eden_for_pause_time " diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp index cf7a1c64c32b2..f3ebccd6969f9 100644 --- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp +++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp @@ -116,16 +116,13 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy { // Accessors double gc_minor_pause_goal_sec() const { return _gc_minor_pause_goal_sec; } - void adjust_eden_for_minor_pause_time(bool is_full_gc, - size_t* desired_eden_size_ptr); + 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. void adjust_promo_for_pause_time(bool is_full_gc, size_t* desired_promo_size_ptr, size_t* desired_eden_size_ptr); - void adjust_eden_for_pause_time(bool is_full_gc, - size_t* desired_promo_size_ptr, - size_t* desired_eden_size_ptr); + void adjust_eden_for_pause_time(size_t* desired_promo_size_ptr, size_t* desired_eden_size_ptr); // Change the generation sizes to achieve an application throughput goal // Returned sizes are not necessarily aligned. void adjust_promo_for_throughput(bool is_full_gc,