From 7cf18ee1eb54ab7f902000d81106895e2c0be541 Mon Sep 17 00:00:00 2001 From: Oli Gillespie Date: Mon, 15 May 2023 15:06:03 +0000 Subject: [PATCH] Backport 3f1927a7f3a2914402a25335c47a5a8bdd5511a6 --- src/hotspot/share/gc/g1/g1FullCollector.cpp | 5 ++++- src/hotspot/share/gc/parallel/psParallelCompact.cpp | 5 ++++- src/hotspot/share/gc/serial/genMarkSweep.cpp | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp index 0522528ebef..78bc3e84bac 100644 --- a/src/hotspot/share/gc/g1/g1FullCollector.cpp +++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp @@ -304,7 +304,10 @@ void G1FullCollector::phase1_mark_live_objects() { _heap->complete_cleaning(&_is_alive, purged_class); } - scope()->tracer()->report_object_count_after_gc(&_is_alive); + { + GCTraceTime(Debug, gc, phases) debug("Report Object Count", scope()->timer()); + scope()->tracer()->report_object_count_after_gc(&_is_alive); + } } void G1FullCollector::phase2_prepare_compaction() { diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index 33554561f89..7258967a591 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -2137,7 +2137,10 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm, JVMCI_ONLY(JVMCI::do_unloading(purged_class)); } - _gc_tracer.report_object_count_after_gc(is_alive_closure()); + { + GCTraceTime(Debug, gc, phases) tm("Report Object Count", &_gc_timer); + _gc_tracer.report_object_count_after_gc(is_alive_closure()); + } } #ifdef ASSERT diff --git a/src/hotspot/share/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp index 38ebfef2803..5a8d2845bef 100644 --- a/src/hotspot/share/gc/serial/genMarkSweep.cpp +++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp @@ -230,7 +230,10 @@ void GenMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) { JVMCI_ONLY(JVMCI::do_unloading(purged_class)); } - gc_tracer()->report_object_count_after_gc(&is_alive); + { + GCTraceTime(Debug, gc, phases) tm_m("Report Object Count", gc_timer()); + gc_tracer()->report_object_count_after_gc(&is_alive); + } }