From 35471a948739ca13b85fe900871e081d553f68e6 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Tue, 22 Dec 2020 01:55:15 +0900 Subject: add Ractor#[]/#[]= for ractor local storage This API is similar to plain old Thread#[]/Fiber#[] interface with symbol key. --- ractor.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'ractor.c') diff --git a/ractor.c b/ractor.c index fab4646c08..5937ac65bb 100644 --- a/ractor.c +++ b/ractor.c @@ -2928,6 +2928,13 @@ ractor_local_storage_mark_i(st_data_t key, st_data_t val, st_data_t dmy) return ST_CONTINUE; } +static enum rb_id_table_iterator_result +idkey_local_storage_mark_i(ID id, VALUE val, void *dmy) +{ + rb_gc_mark(val); + return ID_TABLE_CONTINUE; +} + static void ractor_local_storage_mark(rb_ractor_t *r) { @@ -2943,6 +2950,10 @@ ractor_local_storage_mark(rb_ractor_t *r) } } } + + if (r->idkey_local_storage) { + rb_id_table_foreach(r->idkey_local_storage, idkey_local_storage_mark_i, NULL); + } } static int @@ -2960,6 +2971,10 @@ ractor_local_storage_free(rb_ractor_t *r) st_foreach(r->local_storage, ractor_local_storage_free_i, 0); st_free_table(r->local_storage); } + + if (r->idkey_local_storage) { + rb_id_table_free(r->idkey_local_storage); + } } static void @@ -3103,4 +3118,35 @@ rb_ractor_finish_marking(void) } } +static VALUE +ractor_local_value(rb_execution_context_t *ec, VALUE self, VALUE sym) +{ + rb_ractor_t *cr = rb_ec_ractor_ptr(ec); + ID id = rb_check_id(&sym); + struct rb_id_table *tbl = cr->idkey_local_storage; + VALUE val; + + if (id && tbl && rb_id_table_lookup(tbl, id, &val)) { + rp(val); + return val; + } + else { + return Qnil; + } +} + +static VALUE +ractor_local_value_set(rb_execution_context_t *ec, VALUE self, VALUE sym, VALUE val) +{ + rb_ractor_t *cr = rb_ec_ractor_ptr(ec); + ID id = SYM2ID(rb_to_symbol(sym)); + struct rb_id_table *tbl = cr->idkey_local_storage; + + if (tbl == NULL) { + tbl = cr->idkey_local_storage = rb_id_table_create(2); + } + rb_id_table_insert(tbl, id, val); + return val; +} + #include "ractor.rbinc" -- cgit v1.2.3