OpenJDK / zgc / zgc
changeset 56737:8b08eaf9a0eb
8230794: Improve assert to get more information about the JDK-8227695 failure
Reviewed-by: kbarrett, sjohanss
| author | tschatzl |
|---|---|
| date | Wed, 11 Sep 2019 10:19:09 +0200 |
| parents | 931799bfbc10 |
| children | 9046db64ca39 |
| files | src/hotspot/share/gc/g1/g1CollectedHeap.cpp |
| diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Tue Sep 10 12:51:05 2019 -0700 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Wed Sep 11 10:19:09 2019 +0200 @@ -3613,7 +3613,6 @@ p->record_or_add_time_secs(termination_phase, worker_id, cl.term_time()); p->record_or_add_thread_work_item(termination_phase, worker_id, cl.term_attempts()); } - assert(pss->trim_ticks().seconds() == 0.0, "Unexpected partial trimming during evacuation"); } virtual void start_work(uint worker_id) { } @@ -3655,14 +3654,22 @@ class G1EvacuateRegionsTask : public G1EvacuateRegionsBaseTask { G1RootProcessor* _root_processor; + void verify_trim_ticks(G1ParScanThreadState* pss, const char* location) { + assert(pss->trim_ticks().seconds() == 0.0, "Unexpected partial trimming during evacuation at %s %.3lf " JLONG_FORMAT, location, pss->trim_ticks().seconds(), pss->trim_ticks().value()); + } + void scan_roots(G1ParScanThreadState* pss, uint worker_id) { _root_processor->evacuate_roots(pss, worker_id); + verify_trim_ticks(pss, "roots"); _g1h->rem_set()->scan_heap_roots(pss, worker_id, G1GCPhaseTimes::ScanHR, G1GCPhaseTimes::ObjCopy); + verify_trim_ticks(pss, "heap roots"); _g1h->rem_set()->scan_collection_set_regions(pss, worker_id, G1GCPhaseTimes::ScanHR, G1GCPhaseTimes::CodeRoots, G1GCPhaseTimes::ObjCopy); + verify_trim_ticks(pss, "scan cset"); } void evacuate_live_objects(G1ParScanThreadState* pss, uint worker_id) { G1EvacuateRegionsBaseTask::evacuate_live_objects(pss, worker_id, G1GCPhaseTimes::ObjCopy, G1GCPhaseTimes::Termination); + verify_trim_ticks(pss, "evac live"); } void start_work(uint worker_id) {