wip - sync the finalizer table and the flag with a mutex

Author: eightbitraptor

gc/default/default.c

@@ -1607,7 +1607,7 @@ enum object_hash_state {
 static enum object_hash_state
 object_hash_state(VALUE obj)
 {
-short hash_state = (RBASIC(obj)->flags & (RUBY_FL_OBJ_HASH_SEEN | RUBY_FL_OBJ_MOVED)) >> RUBY_FL_OBJ_HASH_SHIFT;
+    short hash_state = (RBASIC(obj)->flags & (RUBY_FL_OBJ_HASH_SEEN | RUBY_FL_OBJ_MOVED)) >> RUBY_FL_OBJ_HASH_SHIFT;
 
     int seen = (RBASIC(obj)->flags & RUBY_FL_OBJ_HASH_SEEN) != 0;
     int moved = (RBASIC(obj)->flags & RUBY_FL_OBJ_MOVED) != 0;

gc/mmtk/mmtk.c

@@ -281,19 +281,30 @@ rb_mmtk_vm_live_bytes(void)
 
 static void set_object_has_finalizer(VALUE obj, bool has_finalizer);
 bool rb_gc_impl_has_finalizer(VALUE obj);
+bool rb_gc_impl_object_id_seen_p(VALUE obj);
+
 static void
 make_final_job(struct objspace *objspace, VALUE obj, VALUE table)
 {
     RUBY_ASSERT(rb_gc_impl_has_finalizer(obj));
     RUBY_ASSERT(mmtk_is_reachable((MMTk_ObjectReference)table));
     RUBY_ASSERT(RB_BUILTIN_TYPE(table) == T_ARRAY);
 
+    VALUE object_id;
+    st_data_t val;
+    if (rb_gc_impl_object_id_seen_p(obj) && 
+        st_lookup(objspace->obj_to_id_tbl, (st_data_t)obj, &val)) {
+        object_id = (VALUE)val;
+    } else {
+        object_id = rb_gc_impl_object_id(objspace, obj);
+    }
+
     set_object_has_finalizer(obj, false);
 
     struct MMTk_final_job *job = xmalloc(sizeof(struct MMTk_final_job));
     job->next = objspace->finalizer_jobs;
     job->kind = MMTK_FINAL_JOB_FINALIZE;
-    job->as.finalize.object_id = rb_obj_id((VALUE)obj);
+    job->as.finalize.object_id = object_id;
     job->as.finalize.finalizer_array = table;
 
     objspace->finalizer_jobs = job;
@@ -371,6 +382,7 @@ set_object_has_finalizer(VALUE obj, bool has_finalizer)
     else {
         struct object_metadata *metadata = xmalloc(sizeof(struct object_metadata));
         metadata->has_finalizer = has_finalizer ? 1 : 0;
+        metadata->seen_obj_id = 0; // Initialize the other fields
         st_insert(object_metadata_table, key, (st_data_t)metadata);
     }
 }
@@ -1073,8 +1085,12 @@ rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block)
     struct objspace *objspace = objspace_ptr;
     VALUE table;
     st_data_t data;
+    VALUE result;
 
-    set_object_has_finalizer(obj, true);
+    int err;
+    if ((err = pthread_mutex_lock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot lock objspace->mutex: %s", strerror(err));
+    }
 
     int lev = rb_gc_vm_lock();
 
@@ -1090,7 +1106,8 @@ rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block)
                 VALUE recv = RARRAY_AREF(table, i);
                 if (rb_equal(recv, block)) {
                     rb_gc_vm_unlock(lev);
-                    return recv;
+                    result = recv;
+                    goto done;
                 }
             }
         }
@@ -1105,17 +1122,34 @@ rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block)
 
     rb_gc_vm_unlock(lev);
 
-    return block;
+    set_object_has_finalizer(obj, true);
+    result = block;
+
+done:
+    if ((err = pthread_mutex_unlock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot release objspace->mutex: %s", strerror(err));
+    }
+
+    return result;
 }
 
 void
 rb_gc_impl_undefine_finalizer(void *objspace_ptr, VALUE obj)
 {
     struct objspace *objspace = objspace_ptr;
-
     st_data_t data = obj;
+
+    int err;
+    if ((err = pthread_mutex_lock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot lock objspace->mutex: %s", strerror(err));
+    }
+
     st_delete(objspace->finalizer_table, &data, 0);
     set_object_has_finalizer(obj, false);
+ 
+    if ((err = pthread_mutex_unlock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot release objspace->mutex: %s", strerror(err));
+    }
 }
 
 bool
@@ -1138,16 +1172,35 @@ rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj)
     struct objspace *objspace = objspace_ptr;
     VALUE table;
     st_data_t data;
+    
+    int err;
+    if ((err = pthread_mutex_lock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot lock objspace->mutex: %s", strerror(err));
+    }
 
-    if (!rb_gc_impl_has_finalizer(obj)) return;
+    bool has_finalizer = rb_gc_impl_has_finalizer(obj);
+    if (!has_finalizer) {
+        if ((err = pthread_mutex_unlock(&objspace->mutex)) != 0) {
+            rb_bug("ERROR: cannot release objspace->mutex: %s", strerror(err));
+        }
+        return;
+    }
 
     if (RB_LIKELY(st_lookup(objspace->finalizer_table, obj, &data))) {
         table = (VALUE)data;
         st_insert(objspace->finalizer_table, dest, table);
         set_object_has_finalizer(dest, true);
     }
     else {
-        rb_bug("rb_gc_copy_finalizer: FL_FINALIZE set but not found in finalizer_table: %s", rb_obj_info(obj));
+        set_object_has_finalizer(obj, false);
+        if ((err = pthread_mutex_unlock(&objspace->mutex)) != 0) {
+            rb_bug("ERROR: cannot release objspace->mutex: %s", strerror(err));
+        }
+        return;
+    }
+
+    if ((err = pthread_mutex_unlock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot release objspace->mutex: %s", strerror(err));
     }
 }