archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 05:29:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Convert marshal_compat_table to use rb_gc_mark_and_move

Browse source 
The `p->field = rb_gc_location(p->field)` isn't ideal because it means all
references are rewritten on compaction, regardless of whether the referenced
object has moved. This isn't good for caches nor for Copy-on-Write.

`rb_gc_mark_and_move` avoid needless writes, and most of the time allow to
have a single function for both marking and updating references.
This commit is contained in:
Jean Boussier 2025-08-07 14:38:19 +02:00
parent a260bbc550
commit 846b5eec57
1 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
marshal.c
View file

@ -2572,19 +2572,19 @@ Init_marshal(void)
} }
static int static int
marshal_compat_table_mark_i(st_data_t key, st_data_t value, st_data_t _) marshal_compat_table_mark_and_move_i(st_data_t key, st_data_t value, st_data_t _)
{ {
marshal_compat_t *p = (marshal_compat_t *)value; marshal_compat_t *p = (marshal_compat_t *)value;
rb_gc_mark_movable(p->newclass); rb_gc_mark_and_move(&p->newclass);
rb_gc_mark_movable(p->oldclass); rb_gc_mark_and_move(&p->oldclass);
return ST_CONTINUE; return ST_CONTINUE;
} }
static void static void
marshal_compat_table_mark(void *tbl) marshal_compat_table_mark_and_move(void *tbl)
{ {
if (!tbl) return; if (!tbl) return;
st_foreach(tbl, marshal_compat_table_mark_i, 0); st_foreach(tbl, marshal_compat_table_mark_and_move_i, 0);
} }
static int static int
@ -2607,29 +2607,13 @@ marshal_compat_table_memsize(const void *data)
return st_memsize(data) + sizeof(marshal_compat_t) * st_table_size(data); return st_memsize(data) + sizeof(marshal_compat_t) * st_table_size(data);
} }
static int
marshal_compat_table_compact_i(st_data_t key, st_data_t value, st_data_t _)
{
marshal_compat_t *p = (marshal_compat_t *)value;
p->newclass = rb_gc_location(p->newclass);
p->oldclass = rb_gc_location(p->oldclass);
return ST_CONTINUE;
}
static void
marshal_compat_table_compact(void *tbl)
{
if (!tbl) return;
st_foreach(tbl, marshal_compat_table_compact_i, 0);
}
static const rb_data_type_t marshal_compat_type = { static const rb_data_type_t marshal_compat_type = {
.wrap_struct_name = "marshal_compat_table", .wrap_struct_name = "marshal_compat_table",
.function = { .function = {
.dmark = marshal_compat_table_mark, .dmark = marshal_compat_table_mark_and_move,
.dfree = marshal_compat_table_free, .dfree = marshal_compat_table_free,
.dsize = marshal_compat_table_memsize, .dsize = marshal_compat_table_memsize,
.dcompact = marshal_compat_table_compact, .dcompact = marshal_compat_table_mark_and_move,
}, },
.flags = RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY, .flags = RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY,
}; };