Add pages_swept_by_ruby_thread counter

Author: luke-gruber

gc/default/default.c

@@ -683,13 +683,18 @@ typedef struct rb_objspace {
         struct timespec ruby_thread_sweep_cpu_start_time;
         struct timespec ruby_thread_sweep_wall_start_time;
 #endif
-        size_t pages_swept_by_sweep_thread;
-        size_t pages_swept_by_sweep_thread_had_deferred_free_objects;
 
         /* Weak references */
         size_t weak_references_count;
     } profile;
 
+    /* Cumulative sweep counters that persist across GC cycles (never reset) */
+    struct {
+        size_t pages_swept_by_sweep_thread;
+        size_t pages_swept_by_sweep_thread_had_deferred_free_objects;
+        size_t pages_swept_by_ruby_thread;
+    } sweep_stats;
+
     VALUE gc_stress_mode;
 
     struct {
@@ -4210,6 +4215,7 @@ gc_sweep_page(rb_objspace_t *objspace, rb_heap_t *heap, struct gc_sweep_context
 #endif
     rbimpl_atomic_store(&sweep_page->before_sweep, 0, RBIMPL_ATOMIC_RELEASE);
     sweep_page->free_slots = 0;
+    objspace->sweep_stats.pages_swept_by_ruby_thread++;
 
     p = (uintptr_t)sweep_page->start;
     bits = sweep_page->mark_bits;
@@ -4572,9 +4578,9 @@ gc_pre_sweep_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *pa
         }
         p += BITS_BITLENGTH * slot_size;
     }
-    objspace->profile.pages_swept_by_sweep_thread++;
+    objspace->sweep_stats.pages_swept_by_sweep_thread++;
     if (page->pre_deferred_free_slots > 0) {
-        objspace->profile.pages_swept_by_sweep_thread_had_deferred_free_objects++;
+        objspace->sweep_stats.pages_swept_by_sweep_thread_had_deferred_free_objects++;
     }
 
 #if RGENGC_CHECK_MODE
@@ -9214,8 +9220,10 @@ enum gc_stat_sym {
     gc_stat_sym_remembered_wb_unprotected_objects_limit,
     gc_stat_sym_old_objects,
     gc_stat_sym_old_objects_limit,
+    gc_stat_sym_pages_swept,
     gc_stat_sym_pages_swept_by_sweep_thread,
     gc_stat_sym_pages_swept_by_sweep_thread_had_deferred_free_objects,
+    gc_stat_sym_pages_swept_by_ruby_thread,
 #if RGENGC_ESTIMATE_OLDMALLOC
     gc_stat_sym_oldmalloc_increase_bytes,
     gc_stat_sym_oldmalloc_increase_bytes_limit,
@@ -9271,8 +9279,10 @@ setup_gc_stat_symbols(void)
         S(remembered_wb_unprotected_objects_limit);
         S(old_objects);
         S(old_objects_limit);
+        S(pages_swept);
         S(pages_swept_by_sweep_thread);
         S(pages_swept_by_sweep_thread_had_deferred_free_objects);
+        S(pages_swept_by_ruby_thread);
 #if RGENGC_ESTIMATE_OLDMALLOC
         S(oldmalloc_increase_bytes);
         S(oldmalloc_increase_bytes_limit);
@@ -9359,8 +9369,10 @@ rb_gc_impl_stat(void *objspace_ptr, VALUE hash_or_sym)
     SET(remembered_wb_unprotected_objects_limit, objspace->rgengc.uncollectible_wb_unprotected_objects_limit);
     SET(old_objects, objspace->rgengc.old_objects);
     SET(old_objects_limit, objspace->rgengc.old_objects_limit);
-    SET(pages_swept_by_sweep_thread, objspace->profile.pages_swept_by_sweep_thread);
-    SET(pages_swept_by_sweep_thread_had_deferred_free_objects, objspace->profile.pages_swept_by_sweep_thread_had_deferred_free_objects);
+    SET(pages_swept, objspace->sweep_stats.pages_swept_by_sweep_thread + objspace->sweep_stats.pages_swept_by_ruby_thread);
+    SET(pages_swept_by_sweep_thread, objspace->sweep_stats.pages_swept_by_sweep_thread);
+    SET(pages_swept_by_sweep_thread_had_deferred_free_objects, objspace->sweep_stats.pages_swept_by_sweep_thread_had_deferred_free_objects);
+    SET(pages_swept_by_ruby_thread, objspace->sweep_stats.pages_swept_by_ruby_thread);
 #if RGENGC_ESTIMATE_OLDMALLOC
     SET(oldmalloc_increase_bytes, objspace->malloc_counters.oldmalloc_increase);
     SET(oldmalloc_increase_bytes_limit, objspace->rgengc.oldmalloc_increase_limit);