OpenJDK / amber / amber
changeset 58525:9510ce1b0190
8232771: Revert JDK-8230794 because of environment changes
Reviewed-by: pliden, sjohanss
| author | tschatzl |
|---|---|
| date | Wed, 23 Oct 2019 14:06:39 +0200 |
| parents | 765710337ee1 |
| children | f67f4674b466 |
| files | src/hotspot/share/gc/g1/g1CollectedHeap.cpp |
| diffstat | 1 files changed, 1 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Wed Oct 23 13:52:33 2019 +0200 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Wed Oct 23 14:06:39 2019 +0200 @@ -3613,6 +3613,7 @@ 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) { } @@ -3654,22 +3655,14 @@ 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) {