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

8232779: G1 current collection parallel time does not include optional evacuation

Browse Source 
Reviewed-by: kbarrett, sangheki
This commit is contained in:
Thomas Schatzl 2019-10-25 12:34:30 +02:00
parent be6a893e1f
commit e4a6d80db2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,7 @@ G1GCPhaseTimes::G1GCPhaseTimes(STWGCTimer* gc_timer, uint max_gc_threads) :
void G1GCPhaseTimes::reset() {
_cur_collection_initial_evac_time_ms = 0.0;
_cur_optional_evac_ms = 0.0;
_cur_optional_evac_time_ms = 0.0;
_cur_collection_code_root_fixup_time_ms = 0.0;
_cur_strong_code_root_purge_time_ms = 0.0;
_cur_merge_heap_roots_time_ms = 0.0;
@ -416,14 +416,14 @@ double G1GCPhaseTimes::print_pre_evacuate_collection_set() const {
}
double G1GCPhaseTimes::print_evacuate_optional_collection_set() const {
const double sum_ms = _cur_optional_evac_ms + _cur_optional_merge_heap_roots_time_ms;
const double sum_ms = _cur_optional_evac_time_ms + _cur_optional_merge_heap_roots_time_ms;
if (sum_ms > 0) {
info_time("Merge Optional Heap Roots", _cur_optional_merge_heap_roots_time_ms);
debug_time("Prepare Optional Merge Heap Roots", _cur_optional_prepare_merge_heap_roots_time_ms);
debug_phase(_gc_par_phases[OptMergeRS]);
info_time("Evacuate Optional Collection Set", _cur_optional_evac_ms);
info_time("Evacuate Optional Collection Set", _cur_optional_evac_time_ms);
debug_phase(_gc_par_phases[OptScanHR]);
debug_phase(_gc_par_phases[OptObjCopy]);
debug_phase(_gc_par_phases[OptCodeRoots]);

6
src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
View File

@ -156,7 +156,7 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
WorkerDataArray<size_t>* _redirtied_cards;
double _cur_collection_initial_evac_time_ms;
double _cur_optional_evac_ms;
double _cur_optional_evac_time_ms;
double _cur_collection_code_root_fixup_time_ms;
double _cur_strong_code_root_purge_time_ms;
@ -296,7 +296,7 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
}
void record_or_add_optional_evac_time(double ms) {
_cur_optional_evac_ms += ms;
_cur_optional_evac_time_ms += ms;
}
void record_or_add_code_root_fixup_time(double ms) {
@ -415,7 +415,7 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
}
double cur_collection_par_time_ms() {
return _cur_collection_initial_evac_time_ms;
return _cur_collection_initial_evac_time_ms + _cur_optional_evac_time_ms;
}
double cur_clear_ct_time_ms() {