--- a/src/hotspot/share/gc/g1/g1RemSet.cpp Fri Dec 07 13:15:35 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp Fri Dec 07 13:54:45 2018 +0100
@@ -311,12 +311,14 @@
G1ScanRSForRegionClosure::G1ScanRSForRegionClosure(G1RemSetScanState* scan_state,
G1ScanObjsDuringScanRSClosure* scan_obj_on_card,
G1ParScanThreadState* pss,
+ G1GCPhaseTimes::GCParPhases phase,
uint worker_i) :
_g1h(G1CollectedHeap::heap()),
_ct(_g1h->card_table()),
_pss(pss),
_scan_objs_on_card_cl(scan_obj_on_card),
_scan_state(scan_state),
+ _phase(phase),
_worker_i(worker_i),
_cards_scanned(0),
_cards_claimed(0),
@@ -402,7 +404,7 @@
scan_card(mr, region_idx_for_card);
}
- event.commit(GCId::current(), _worker_i, G1GCPhaseTimes::phase_name(G1GCPhaseTimes::ScanRS));
+ event.commit(GCId::current(), _worker_i, G1GCPhaseTimes::phase_name(_phase));
}
void G1ScanRSForRegionClosure::scan_strong_code_roots(HeapRegion* r) {
@@ -437,7 +439,7 @@
void G1RemSet::scan_rem_set(G1ParScanThreadState* pss, uint worker_i) {
G1ScanObjsDuringScanRSClosure scan_cl(_g1h, pss);
- G1ScanRSForRegionClosure cl(_scan_state, &scan_cl, pss, worker_i);
+ G1ScanRSForRegionClosure cl(_scan_state, &scan_cl, pss, G1GCPhaseTimes::ScanRS, worker_i);
_g1h->collection_set_iterate_from(&cl, worker_i);
G1GCPhaseTimes* p = _g1p->phase_times();