Skip to content

Commit

Permalink
8322539: Parallel: Remove duplicated methods in PSAdaptiveSizePolicy
Browse files Browse the repository at this point in the history
Reviewed-by: tschatzl, kbarrett
  • Loading branch information
albertnetymk committed Dec 22, 2023
1 parent 84c2379 commit c53f845
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 47 deletions.
34 changes: 0 additions & 34 deletions src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -873,17 +873,6 @@ size_t PSAdaptiveSizePolicy::scale_down(size_t change,
return reduced_change;
}

size_t PSAdaptiveSizePolicy::eden_increment(size_t cur_eden,
uint percent_change) {
size_t eden_heap_delta;
eden_heap_delta = cur_eden / 100 * percent_change;
return eden_heap_delta;
}

size_t PSAdaptiveSizePolicy::eden_increment(size_t cur_eden) {
return eden_increment(cur_eden, YoungGenerationSizeIncrement);
}

size_t PSAdaptiveSizePolicy::eden_increment_with_supplement_aligned_up(
size_t cur_eden) {
size_t result = eden_increment(cur_eden,
Expand All @@ -896,23 +885,6 @@ size_t PSAdaptiveSizePolicy::eden_decrement_aligned_down(size_t cur_eden) {
return align_down(eden_heap_delta, _space_alignment);
}

size_t PSAdaptiveSizePolicy::eden_decrement(size_t cur_eden) {
size_t eden_heap_delta = eden_increment(cur_eden) /
AdaptiveSizeDecrementScaleFactor;
return eden_heap_delta;
}

size_t PSAdaptiveSizePolicy::promo_increment(size_t cur_promo,
uint percent_change) {
size_t promo_heap_delta;
promo_heap_delta = cur_promo / 100 * percent_change;
return promo_heap_delta;
}

size_t PSAdaptiveSizePolicy::promo_increment(size_t cur_promo) {
return promo_increment(cur_promo, TenuredGenerationSizeIncrement);
}

size_t PSAdaptiveSizePolicy::promo_increment_with_supplement_aligned_up(
size_t cur_promo) {
size_t result = promo_increment(cur_promo,
Expand All @@ -925,12 +897,6 @@ size_t PSAdaptiveSizePolicy::promo_decrement_aligned_down(size_t cur_promo) {
return align_down(promo_heap_delta, _space_alignment);
}

size_t PSAdaptiveSizePolicy::promo_decrement(size_t cur_promo) {
size_t promo_heap_delta = promo_increment(cur_promo);
promo_heap_delta = promo_heap_delta / AdaptiveSizeDecrementScaleFactor;
return promo_heap_delta;
}

uint PSAdaptiveSizePolicy::compute_survivor_space_size_and_threshold(
bool is_survivor_overflow,
uint tenuring_threshold,
Expand Down
7 changes: 0 additions & 7 deletions src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,10 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy {
size_t desired_total);

// Size in bytes for an increment or decrement of eden.
virtual size_t eden_increment(size_t cur_eden, uint percent_change);
virtual size_t eden_decrement(size_t cur_eden);
size_t eden_decrement_aligned_down(size_t cur_eden);
size_t eden_increment_with_supplement_aligned_up(size_t cur_eden);

// Size in bytes for an increment or decrement of the promotion area
virtual size_t promo_increment(size_t cur_promo, uint percent_change);
virtual size_t promo_decrement(size_t cur_promo);
size_t promo_decrement_aligned_down(size_t cur_promo);
size_t promo_increment_with_supplement_aligned_up(size_t cur_promo);

Expand Down Expand Up @@ -173,9 +169,6 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy {
virtual GCPolicyKind kind() const { return _gc_ps_adaptive_size_policy; }

public:
virtual size_t eden_increment(size_t cur_eden);
virtual size_t promo_increment(size_t cur_promo);

// Accessors for use by performance counters
AdaptivePaddedNoZeroDevAverage* avg_promoted() const {
return _gc_stats.avg_promoted();
Expand Down
12 changes: 6 additions & 6 deletions src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,12 @@ class AdaptiveSizePolicy : public CHeapObj<mtGC> {
// to use minor_collection_end() in its current form.
}

virtual size_t eden_increment(size_t cur_eden);
virtual size_t eden_increment(size_t cur_eden, uint percent_change);
virtual size_t eden_decrement(size_t cur_eden);
virtual size_t promo_increment(size_t cur_eden);
virtual size_t promo_increment(size_t cur_eden, uint percent_change);
virtual size_t promo_decrement(size_t cur_eden);
size_t eden_increment(size_t cur_eden);
size_t eden_increment(size_t cur_eden, uint percent_change);
size_t eden_decrement(size_t cur_eden);
size_t promo_increment(size_t cur_eden);
size_t promo_increment(size_t cur_eden, uint percent_change);
size_t promo_decrement(size_t cur_eden);

virtual void clear_generation_free_space_flags();

Expand Down

1 comment on commit c53f845

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.