From beed4145ec014addc7fe6ca82652740c247da496 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Tue, 20 Feb 2024 09:38:13 +0000 Subject: [PATCH] 8326209: G1: Remove G1ConcurrentMark::_total_cleanup_time Reviewed-by: kbarrett, tschatzl --- src/hotspot/share/gc/g1/g1ConcurrentMark.cpp | 7 ++----- src/hotspot/share/gc/g1/g1ConcurrentMark.hpp | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp index cb7f90b0847..723b26c4bf3 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp @@ -485,7 +485,6 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h, _remark_mark_times(), _remark_weak_ref_times(), _cleanup_times(), - _total_cleanup_time(0.0), _accum_task_vtime(nullptr), @@ -1549,9 +1548,7 @@ void G1ConcurrentMark::cleanup() { verify_during_pause(G1HeapVerifier::G1VerifyCleanup, VerifyLocation::CleanupAfter); // Local statistics - double recent_cleanup_time = (os::elapsedTime() - start); - _total_cleanup_time += recent_cleanup_time; - _cleanup_times.add(recent_cleanup_time); + _cleanup_times.add((os::elapsedTime() - start) * 1000.0); { GCTraceTime(Debug, gc, phases) debug("Finalize Concurrent Mark Cleanup", _gc_timer_cm); @@ -2126,7 +2123,7 @@ void G1ConcurrentMark::print_summary_info() { } print_ms_time_info(" ", "cleanups", _cleanup_times); log.trace(" Finalize live data total time = %8.2f s (avg = %8.2f ms).", - _total_cleanup_time, (_cleanup_times.num() > 0 ? _total_cleanup_time * 1000.0 / (double)_cleanup_times.num() : 0.0)); + _cleanup_times.sum() / 1000.0, _cleanup_times.avg()); log.trace(" Total stop_world time = %8.2f s.", (_init_times.sum() + _remark_times.sum() + _cleanup_times.sum())/1000.0); log.trace(" Total concurrent time = %8.2f s (%8.2f s marking).", diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp index a4315ec5f6c..60d14984ca0 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp @@ -440,7 +440,6 @@ class G1ConcurrentMark : public CHeapObj { NumberSeq _remark_mark_times; NumberSeq _remark_weak_ref_times; NumberSeq _cleanup_times; - double _total_cleanup_time; double* _accum_task_vtime; // Accumulated task vtime