author | kbarrett |
Fri, 30 Aug 2019 15:36:44 -0400 | |
changeset 57973 | e9a0224b45a1 |
parent 57972 | 374f3f9dda6f |
child 57974 | 1262b3ddd7e4 |
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Fri Aug 30 14:58:40 2019 -0400 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Fri Aug 30 15:36:44 2019 -0400 @@ -1948,12 +1948,8 @@ void G1CollectedHeap::iterate_dirty_card_closure(G1CardTableEntryClosure* cl, uint worker_i) { G1DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set(); - size_t n_completed_buffers = 0; - while (dcqs.apply_closure_during_gc(cl, worker_i)) { - n_completed_buffers++; - } + while (dcqs.apply_closure_during_gc(cl, worker_i)) {} assert(dcqs.num_cards() == 0, "Completed buffers exist!"); - phase_times()->record_thread_work_item(G1GCPhaseTimes::MergeLB, worker_i, n_completed_buffers, G1GCPhaseTimes::MergeLBProcessedBuffers); } // Computes the sum of the storage used by the various regions.
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp Fri Aug 30 14:58:40 2019 -0400 +++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp Fri Aug 30 15:36:44 2019 -0400 @@ -125,8 +125,6 @@ _opt_scan_hr_used_memory = new WorkerDataArray<size_t>(max_gc_threads, "Used Memory:"); _gc_par_phases[OptScanHR]->link_thread_work_items(_opt_scan_hr_used_memory, ScanHRUsedMemory); - _merge_lb_processed_buffers = new WorkerDataArray<size_t>(max_gc_threads, "Processed Buffers:"); - _gc_par_phases[MergeLB]->link_thread_work_items(_merge_lb_processed_buffers, MergeLBProcessedBuffers); _merge_lb_dirty_cards = new WorkerDataArray<size_t>(max_gc_threads, "Dirty Cards:"); _gc_par_phases[MergeLB]->link_thread_work_items(_merge_lb_dirty_cards, MergeLBDirtyCards); _merge_lb_skipped_cards = new WorkerDataArray<size_t>(max_gc_threads, "Skipped Cards:");
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp Fri Aug 30 14:58:40 2019 -0400 +++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp Fri Aug 30 15:36:44 2019 -0400 @@ -106,7 +106,6 @@ }; enum GCMergeLBWorkItems { - MergeLBProcessedBuffers, MergeLBDirtyCards, MergeLBSkippedCards }; @@ -129,7 +128,6 @@ WorkerDataArray<size_t>* _merge_hcc_dirty_cards; WorkerDataArray<size_t>* _merge_hcc_skipped_cards; - WorkerDataArray<size_t>* _merge_lb_processed_buffers; WorkerDataArray<size_t>* _merge_lb_dirty_cards; WorkerDataArray<size_t>* _merge_lb_skipped_cards;
--- a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java Fri Aug 30 14:58:40 2019 -0400 +++ b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java Fri Aug 30 15:36:44 2019 -0400 @@ -105,7 +105,6 @@ new LogMessageWithLevel("Merged Coarse", Level.DEBUG), new LogMessageWithLevel("Hot Card Cache", Level.DEBUG), new LogMessageWithLevel("Log Buffers", Level.DEBUG), - new LogMessageWithLevel("Processed Buffers", Level.DEBUG), new LogMessageWithLevel("Dirty Cards", Level.DEBUG), new LogMessageWithLevel("Skipped Cards", Level.DEBUG), // Scan Heap Roots