8355743: G1: Collection set clearing is not recorded as part of "Free Collection Set Time"

Thomas Schatzl · Thomas Schatzl · commit b8d2bdb46529 · 2025-05-15T08:03:44.000Z
Reviewed-by: iwalulya, shade
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
@@ -881,10 +881,10 @@ class G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask : public G1
     }
     FREE_C_HEAP_ARRAY(FreeCSetStats, _worker_stats);
 
+    _g1h->clear_collection_set();
+
     G1GCPhaseTimes* p = _g1h->phase_times();
     p->record_serial_free_cset_time_ms((Ticks::now() - serial_time).seconds() * 1000.0);
-
-    _g1h->clear_collection_set();
   }
 
   double worker_cost() const override { return G1CollectedHeap::heap()->collection_set()->region_length(); }

Original file line number	Diff line number	Diff line change
`@@ -881,10 +881,10 @@ class G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask : public G1`
`881`	`881`	`}`
`882`	`882`	`FREE_C_HEAP_ARRAY(FreeCSetStats, _worker_stats);`
`883`	`883`
	`884`	`+ _g1h->clear_collection_set();`
	`885`	`+`
`884`	`886`	`G1GCPhaseTimes* p = _g1h->phase_times();`
`885`	`887`	`p->record_serial_free_cset_time_ms((Ticks::now() - serial_time).seconds() * 1000.0);`
`886`		`-`
`887`		`- _g1h->clear_collection_set();`
`888`	`888`	`}`
`889`	`889`
`890`	`890`	`double worker_cost() const override { return G1CollectedHeap::heap()->collection_set()->region_length(); }`