Skip to content

Commit 61c7351

Browse files
olivergillespiePaul Hohensee
authored andcommitted
8307346: Add missing gc+phases logging for ObjectCount(AfterGC) JFR event collection code
Backport-of: 3f1927a7f3a2914402a25335c47a5a8bdd5511a6
1 parent 7610862 commit 61c7351

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

src/hotspot/share/gc/g1/g1FullCollector.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,10 @@ void G1FullCollector::phase1_mark_live_objects() {
304304
_heap->complete_cleaning(&_is_alive, purged_class);
305305
}
306306

307-
scope()->tracer()->report_object_count_after_gc(&_is_alive);
307+
{
308+
GCTraceTime(Debug, gc, phases) debug("Report Object Count", scope()->timer());
309+
scope()->tracer()->report_object_count_after_gc(&_is_alive);
310+
}
308311
}
309312

310313
void G1FullCollector::phase2_prepare_compaction() {

src/hotspot/share/gc/parallel/psParallelCompact.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2137,7 +2137,10 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm,
21372137
JVMCI_ONLY(JVMCI::do_unloading(purged_class));
21382138
}
21392139

2140-
_gc_tracer.report_object_count_after_gc(is_alive_closure());
2140+
{
2141+
GCTraceTime(Debug, gc, phases) tm("Report Object Count", &_gc_timer);
2142+
_gc_tracer.report_object_count_after_gc(is_alive_closure());
2143+
}
21412144
}
21422145

21432146
#ifdef ASSERT

src/hotspot/share/gc/serial/genMarkSweep.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,10 @@ void GenMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
230230
JVMCI_ONLY(JVMCI::do_unloading(purged_class));
231231
}
232232

233-
gc_tracer()->report_object_count_after_gc(&is_alive);
233+
{
234+
GCTraceTime(Debug, gc, phases) tm_m("Report Object Count", gc_timer());
235+
gc_tracer()->report_object_count_after_gc(&is_alive);
236+
}
234237
}
235238

236239

0 commit comments

Comments
 (0)