stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8223018: Rename G1RemSet::*oops_into_collection_set_do methods

Browse Source 
Reviewed-by: manc, sangheki
This commit is contained in:
Thomas Schatzl 2019-05-14 15:36:26 +02:00
parent 3d149df158
commit b1278c587f
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3577,7 +3577,7 @@ void G1CollectedHeap::pre_evacuate_collection_set(G1EvacuationInfo& evacuation_i
register_regions_with_region_attr();
assert(_verifier->check_cset_fast_test(), "Inconsistency in the InCSetState table.");
rem_set()->prepare_for_oops_into_collection_set_do();
rem_set()->prepare_for_scan_rem_set();
_preserved_marks_set.assert_empty();
#if COMPILER2_OR_JVMCI
@ -3790,7 +3790,7 @@ void G1CollectedHeap::evacuate_optional_collection_set(G1ParScanThreadStateSet*
void G1CollectedHeap::post_evacuate_collection_set(G1EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* per_thread_states) {
// Also cleans the card table from temporary duplicate detection information used
// during UpdateRS/ScanRS.
rem_set()->cleanup_after_oops_into_collection_set_do();
rem_set()->cleanup_after_scan_rem_set();
// Process any discovered reference objects - we have
// to do this _before_ we retire the GC alloc regions

4
src/hotspot/share/gc/g1/g1RemSet.cpp
View File

@ -545,12 +545,12 @@ void G1RemSet::update_rem_set(G1ParScanThreadState* pss, uint worker_i) {
}
}
void G1RemSet::prepare_for_oops_into_collection_set_do() {
void G1RemSet::prepare_for_scan_rem_set() {
G1BarrierSet::dirty_card_queue_set().concatenate_logs();
_scan_state->reset();
}
void G1RemSet::cleanup_after_oops_into_collection_set_do() {
void G1RemSet::cleanup_after_scan_rem_set() {
G1GCPhaseTimes* phase_times = _g1h->phase_times();
// Set all cards back to clean.

9
src/hotspot/share/gc/g1/g1RemSet.hpp
View File

@ -98,11 +98,10 @@ public:
// into the collection set or update the remembered set.
void update_rem_set(G1ParScanThreadState* pss, uint worker_i);
// Prepare for and cleanup after an oops_into_collection_set_do
// call. Must call each of these once before and after (in sequential
// code) any thread calls oops_into_collection_set_do.
void prepare_for_oops_into_collection_set_do();
void cleanup_after_oops_into_collection_set_do();
// Prepare for and cleanup after scanning the remembered sets. Must be called
// once before and after in sequential code.
void prepare_for_scan_rem_set();
void cleanup_after_scan_rem_set();
G1RemSetScanState* scan_state() const { return _scan_state; }