Skip to content

Commit e4c7850

Browse files
committedJul 31, 2024
8337027: Parallel: Obsolete BaseFootPrintEstimate
Reviewed-by: tschatzl, kbarrett
1 parent fdb4350 commit e4c7850

File tree

7 files changed

+9
-32
lines changed

7 files changed

+9
-32
lines changed
 

‎src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -205,8 +205,6 @@ void PSAdaptiveSizePolicy::compute_eden_space_size(
205205
bool is_full_gc) {
206206

207207
// Update statistics
208-
// Time statistics are updated as we go, update footprint stats here
209-
_avg_base_footprint->sample(BaseFootPrintEstimate);
210208
avg_young_live()->sample(young_live);
211209
avg_eden_live()->sample(eden_live);
212210

@@ -363,8 +361,7 @@ void PSAdaptiveSizePolicy::compute_eden_space_size(
363361
log_debug(gc, ergo)("Live_space: " SIZE_FORMAT " free_space: " SIZE_FORMAT,
364362
live_space(), free_space());
365363

366-
log_trace(gc, ergo)("Base_footprint: " SIZE_FORMAT " avg_young_live: " SIZE_FORMAT " avg_old_live: " SIZE_FORMAT,
367-
(size_t)_avg_base_footprint->average(),
364+
log_trace(gc, ergo)("avg_young_live: " SIZE_FORMAT " avg_old_live: " SIZE_FORMAT,
368365
(size_t)avg_young_live()->average(),
369366
(size_t)avg_old_live()->average());
370367

@@ -535,8 +532,7 @@ void PSAdaptiveSizePolicy::compute_old_gen_free_space(
535532
log_debug(gc, ergo)("Live_space: " SIZE_FORMAT " free_space: " SIZE_FORMAT,
536533
live_space(), free_space());
537534

538-
log_trace(gc, ergo)("Base_footprint: " SIZE_FORMAT " avg_young_live: " SIZE_FORMAT " avg_old_live: " SIZE_FORMAT,
539-
(size_t)_avg_base_footprint->average(),
535+
log_trace(gc, ergo)("avg_young_live: " SIZE_FORMAT " avg_old_live: " SIZE_FORMAT,
540536
(size_t)avg_young_live()->average(),
541537
(size_t)avg_old_live()->average());
542538

‎src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -145,8 +145,7 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy {
145145

146146
// Footprint accessors
147147
size_t live_space() const {
148-
return (size_t)(avg_base_footprint()->average() +
149-
avg_young_live()->average() +
148+
return (size_t)(avg_young_live()->average() +
150149
avg_old_live()->average());
151150
}
152151
size_t free_space() const {

‎src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -107,10 +107,6 @@ PSGCAdaptivePolicyCounters::PSGCAdaptivePolicyCounters(const char* name_arg,
107107
_free_space = PerfDataManager::create_variable(SUN_GC, cname,
108108
PerfData::U_Bytes, ps_size_policy()->free_space(), CHECK);
109109

110-
cname = PerfDataManager::counter_name(name_space(), "avgBaseFootprint");
111-
_avg_base_footprint = PerfDataManager::create_variable(SUN_GC, cname,
112-
PerfData::U_Bytes, (jlong) ps_size_policy()->avg_base_footprint()->average(), CHECK);
113-
114110
cname = PerfDataManager::counter_name(name_space(), "liveAtLastFullGc");
115111
_live_at_last_full_gc_counter =
116112
PerfDataManager::create_variable(SUN_GC, cname,
@@ -157,7 +153,6 @@ void PSGCAdaptivePolicyCounters::update_counters_from_policy() {
157153
update_decrement_tenuring_threshold_for_survivor_limit();
158154
update_live_space();
159155
update_free_space();
160-
update_avg_base_footprint();
161156

162157
update_change_old_gen_for_maj_pauses();
163158
update_change_young_gen_for_maj_pauses();

‎src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,6 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
5050
PerfVariable* _avg_major_interval;
5151
PerfVariable* _live_space;
5252
PerfVariable* _free_space;
53-
PerfVariable* _avg_base_footprint;
5453
PerfVariable* _live_at_last_full_gc_counter;
5554
PerfVariable* _old_capacity;
5655

@@ -142,11 +141,6 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
142141
_free_space->set_value(ps_size_policy()->free_space());
143142
}
144143

145-
inline void update_avg_base_footprint() {
146-
_avg_base_footprint->set_value(
147-
(jlong)(ps_size_policy()->avg_base_footprint()->average())
148-
);
149-
}
150144
inline void update_avg_old_live() {
151145
_avg_old_live_counter->set_value(
152146
(jlong)(ps_size_policy()->avg_old_live()->average())

‎src/hotspot/share/gc/shared/gc_globals.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,6 @@
422422
"Initial ratio of young generation/survivor space size") \
423423
range(0, max_uintx) \
424424
\
425-
product(size_t, BaseFootPrintEstimate, 256*M, \
426-
"Estimate of footprint other than Java Heap") \
427-
range(0, max_uintx) \
428-
\
429425
product(bool, UseGCOverheadLimit, true, \
430426
"Use policy to limit of proportion of time spent in GC " \
431427
"before an OutOfMemory error is thrown") \

‎src/hotspot/share/runtime/arguments.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,8 @@ static SpecialFlag const special_jvm_flags[] = {
521521
{ "RTMRetryCount", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
522522
#endif // X86
523523

524+
525+
{ "BaseFootPrintEstimate", JDK_Version::undefined(), JDK_Version::jdk(24), JDK_Version::jdk(25) },
524526
{ "HeapFirstMaximumCompactionCount", JDK_Version::undefined(), JDK_Version::jdk(24), JDK_Version::jdk(25) },
525527
{ "UseVtableBasedCHA", JDK_Version::undefined(), JDK_Version::jdk(24), JDK_Version::jdk(25) },
526528
#ifdef ASSERT
@@ -1653,9 +1655,6 @@ jint Arguments::set_aggressive_heap_flags() {
16531655
#endif
16541656

16551657
// Increase some data structure sizes for efficiency
1656-
if (FLAG_SET_CMDLINE(BaseFootPrintEstimate, MaxHeapSize) != JVMFlag::SUCCESS) {
1657-
return JNI_EINVAL;
1658-
}
16591658
if (FLAG_SET_CMDLINE(ResizeTLAB, false) != JVMFlag::SUCCESS) {
16601659
return JNI_EINVAL;
16611660
}

‎src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap

-2
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,6 @@ alias sun.gc.lastCause // 1.5.0 b39
404404
hotspot.gc.last_cause // 1.4.2_02
405405

406406
// sun.gc.policy
407-
alias sun.gc.policy.avgBaseFootprint // 1.5.0 b39
408-
hotspot.gc.policy.avg_base_footprint // 1.5.0 b21
409407
alias sun.gc.policy.avgMajorIntervalTime // 1.5.0 b39
410408
hotspot.gc.policy.avg_major_interval // 1.5.0 b21
411409
alias sun.gc.policy.avgMajorPauseTime // 1.5.0 b39

0 commit comments

Comments
 (0)
Please sign in to comment.