only update fragmentation data for pages that are not lazily freed (#57907)

d-netto · KristofferC · commit 46ddb2ff02a5 · 2025-03-31T09:45:37.000+02:00
We are including data from lazily freed pages into this metric, which makes it inaccurate. Thanks @qinsoon for spotting it. (cherry picked from commit d6fdbf5)
diff --git a/src/gc-stock.c b/src/gc-stock.c
@@ -948,6 +948,7 @@ static void gc_sweep_page(gc_page_profiler_serializer_t *s, jl_gc_pool_t *p, jl_
 
 done:
     if (re_use_page) {
+        gc_update_page_fragmentation_data(pg);
         push_lf_back(allocd, pg);
     }
     else {
@@ -956,7 +957,6 @@ static void gc_sweep_page(gc_page_profiler_serializer_t *s, jl_gc_pool_t *p, jl_
         push_lf_back(&global_page_pool_lazily_freed, pg);
     }
     gc_page_profile_write_to_file(s);
-    gc_update_page_fragmentation_data(pg);
     gc_time_count_page(freedall, pg_skpd);
     jl_ptls_t ptls = jl_current_task->ptls;
     // Note that we aggregate the `pool_live_bytes` over all threads before returning this

Original file line number	Diff line number	Diff line change
`@@ -948,6 +948,7 @@ static void gc_sweep_page(gc_page_profiler_serializer_t s, jl_gc_pool_t p, jl_`
`948`	`948`
`949`	`949`	`done:`
`950`	`950`	`if (re_use_page) {`
	`951`	`+ gc_update_page_fragmentation_data(pg);`
`951`	`952`	`push_lf_back(allocd, pg);`
`952`	`953`	`}`
`953`	`954`	`else {`
`@@ -956,7 +957,6 @@ static void gc_sweep_page(gc_page_profiler_serializer_t s, jl_gc_pool_t p, jl_`
`956`	`957`	`push_lf_back(&global_page_pool_lazily_freed, pg);`
`957`	`958`	`}`
`958`	`959`	`gc_page_profile_write_to_file(s);`
`959`		`- gc_update_page_fragmentation_data(pg);`
`960`	`960`	`gc_time_count_page(freedall, pg_skpd);`
`961`	`961`	`jl_ptls_t ptls = jl_current_task->ptls;`
`962`	`962`	// Note that we aggregate the `pool_live_bytes` over all threads before returning this