infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-04 02:35:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8137280: Remove eager reclaim of humongous controls

Browse Source 
Reviewed-by: tschatzl, iwalulya
This commit is contained in:
Albert Mingkun Yang 2022-07-07 13:53:24 +00:00
parent 77ad998b6e
commit 013a5eeeb9
6 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hotspot/share/gc/g1/g1CollectedHeap.cpp
View File

@ -2685,9 +2685,7 @@ bool G1CollectedHeap::is_potential_eager_reclaim_candidate(HeapRegion* r) const
// the assumption that such objects are likely still live.
HeapRegionRemSet* rem_set = r->rem_set();
return G1EagerReclaimHumongousObjectsWithStaleRefs ?
rem_set->occupancy_less_or_equal_than(G1EagerReclaimRemSetThreshold) :
G1EagerReclaimHumongousObjects && rem_set->is_empty();
return rem_set->occupancy_less_or_equal_than(G1EagerReclaimRemSetThreshold);
}
#ifndef PRODUCT
@ -2923,18 +2921,6 @@ void G1CollectedHeap::make_pending_list_reachable() {
}
}
static bool do_humongous_object_logging() {
return log_is_enabled(Debug, gc, humongous);
}
bool G1CollectedHeap::should_do_eager_reclaim() const {
// As eager reclaim logging also gives information about humongous objects in
// the heap in general, always do the eager reclaim pass even without known
// candidates.
return (G1EagerReclaimHumongousObjects &&
(has_humongous_reclaim_candidates() || do_humongous_object_logging()));
}
void G1CollectedHeap::set_humongous_stats(uint num_humongous_total, uint num_humongous_candidates) {
_num_humongous_objects = num_humongous_total;
_num_humongous_reclaim_candidates = num_humongous_candidates;

2
src/hotspot/share/gc/g1/g1CollectedHeap.hpp
View File

@ -236,8 +236,6 @@ public:
uint num_humongous_reclaim_candidates() const { return _num_humongous_reclaim_candidates; }
bool has_humongous_reclaim_candidates() const { return _num_humongous_reclaim_candidates > 0; }
bool should_do_eager_reclaim() const;
void set_humongous_stats(uint num_humongous_total, uint num_humongous_candidates);
bool should_sample_collection_set_candidates() const;

5
src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
View File

@ -496,9 +496,8 @@ double G1GCPhaseTimes::print_post_evacuate_collection_set(bool evacuation_failed
#if COMPILER2_OR_JVMCI
debug_phase(_gc_par_phases[UpdateDerivedPointers], 1);
#endif
if (G1CollectedHeap::heap()->should_do_eager_reclaim()) {
debug_phase(_gc_par_phases[EagerlyReclaimHumongousObjects], 1);
}
debug_phase(_gc_par_phases[EagerlyReclaimHumongousObjects], 1);
if (G1CollectedHeap::heap()->should_sample_collection_set_candidates()) {
debug_phase(_gc_par_phases[SampleCollectionSetCandidates], 1);
}

6
src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
View File

@ -280,8 +280,6 @@ public:
g1h->decrement_summary_bytes(_bytes_freed);
}
static bool should_execute() { return G1CollectedHeap::heap()->should_do_eager_reclaim(); }
double worker_cost() const override { return 1.0; }
void do_work(uint worker_id) override {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
@ -673,9 +671,7 @@ G1PostEvacuateCollectionSetCleanupTask2::G1PostEvacuateCollectionSetCleanupTask2
#if COMPILER2_OR_JVMCI
add_serial_task(new UpdateDerivedPointersTask());
#endif
if (EagerlyReclaimHumongousObjectsTask::should_execute()) {
add_serial_task(new EagerlyReclaimHumongousObjectsTask());
}
add_serial_task(new EagerlyReclaimHumongousObjectsTask());
if (evac_failure_regions->evacuation_failed()) {
add_parallel_task(new RestorePreservedMarksTask(per_thread_states->preserved_marks_set()));

7
src/hotspot/share/gc/g1/g1_globals.hpp
View File

@ -310,13 +310,6 @@
"The target number of mixed GCs after a marking cycle.") \
range(0, max_uintx) \
\
product(bool, G1EagerReclaimHumongousObjects, true, EXPERIMENTAL, \
"Try to reclaim dead large objects at every young GC.") \
\
product(bool, G1EagerReclaimHumongousObjectsWithStaleRefs, true, EXPERIMENTAL, \
"Try to reclaim dead large objects that have a few stale " \
"references at every young GC.") \
\
product(uint, G1EagerReclaimRemSetThreshold, 0, EXPERIMENTAL, \
"Maximum number of remembered set entries a humongous region " \
"otherwise eligible for eager reclaim may have to be a candidate "\

3
test/hotspot/jtreg/gc/g1/TestGreyReclaimedHumongousObjects.java
View File

@ -30,9 +30,6 @@ package gc.g1;
* @summary Test handling of marked but unscanned reclaimed humongous objects.
* @modules jdk.management
* @run main/othervm -XX:+UseG1GC -Xss32m -Xmx128m -XX:G1HeapRegionSize=1m
* -XX:+UnlockExperimentalVMOptions
* -XX:+G1EagerReclaimHumongousObjects
* -XX:+G1EagerReclaimHumongousObjectsWithStaleRefs
* gc.g1.TestGreyReclaimedHumongousObjects 1048576 90
*/