Skip to content

Implement object movement support for finalizer table #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterzhu2118 merged 1 commit into from
Jan 13, 2026
+25 −4
Merged

Implement object movement support for finalizer table #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions gc/mmtk/mmtk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ RB_THREAD_LOCAL_SPECIFIER VALUE marking_parent_object;

#include <pthread.h>

static inline VALUE rb_mmtk_call_object_closure(VALUE obj, bool pin);

static void
rb_mmtk_init_gc_worker_thread(MMTk_VMWorkerThread gc_thread_tls)
{
Expand Down Expand Up @@ -361,15 +363,22 @@ make_final_job(struct objspace *objspace, VALUE obj, VALUE table)
}

static int
rb_mmtk_update_finalizer_table_i(st_data_t key, st_data_t value, st_data_t data)
rb_mmtk_update_finalizer_table_i(st_data_t key, st_data_t value, st_data_t data, int error)
{
RUBY_ASSERT(RB_FL_TEST(key, RUBY_FL_FINALIZE));
RUBY_ASSERT(mmtk_is_reachable((MMTk_ObjectReference)value));
RUBY_ASSERT(RB_BUILTIN_TYPE(value) == T_ARRAY);

struct objspace *objspace = (struct objspace *)data;

if (!mmtk_is_reachable((MMTk_ObjectReference)key)) {
if (mmtk_is_reachable((MMTk_ObjectReference)key)) {
VALUE new_key_location = rb_mmtk_call_object_closure((VALUE)key, false);

if (new_key_location != key) {
return ST_REPLACE;
}
}
else {
make_final_job(objspace, (VALUE)key, (VALUE)value);

rb_postponed_job_trigger(objspace->finalizer_postponed_job);
Expand All @@ -380,13 +389,25 @@ rb_mmtk_update_finalizer_table_i(st_data_t key, st_data_t value, st_data_t data)
return ST_CONTINUE;
}

static int
rb_mmtk_update_finalizer_table_replace_i(st_data_t *key, st_data_t *value, st_data_t data, int existing)
{
*key = rb_mmtk_call_object_closure((VALUE)*key, false);

return ST_CONTINUE;
}

static void
rb_mmtk_update_finalizer_table(void)
{
struct objspace *objspace = rb_gc_get_objspace();

// TODO: replace with st_foreach_with_replace when GC is moving
st_foreach(objspace->finalizer_table, rb_mmtk_update_finalizer_table_i, (st_data_t)objspace);
st_foreach_with_replace(
objspace->finalizer_table,
rb_mmtk_update_finalizer_table_i,
rb_mmtk_update_finalizer_table_replace_i,
(st_data_t)objspace
);
}

static int
Expand Down
Loading