summaryrefslogtreecommitdiff
path: root/ractor.c
diff options
context:
space:
mode:
authorKoichi Sasada <ko1@atdot.net>2020-11-28 04:39:09 +0900
committerKoichi Sasada <ko1@atdot.net>2020-12-01 09:39:30 +0900
commit67693d8d806e67d6e50b303dd0be6ec06b81c853 (patch)
treeb0947049393400f046ac554b7f3573cd73b80af0 /ractor.c
parente79f1941b29738d95b42f8cb5bdb159e7138cf49 (diff)
ractor local storage C-API
To manage ractor-local data for C extension, the following APIs are defined. * rb_ractor_local_storage_value_newkey * rb_ractor_local_storage_value * rb_ractor_local_storage_value_set * rb_ractor_local_storage_ptr_newkey * rb_ractor_local_storage_ptr * rb_ractor_local_storage_ptr_set At first, you need to create a key of storage by rb_ractor_local_(value|ptr)_newkey(). For ptr storage, it accepts the type of storage, how to mark and how to free with ractor's lifetime. rb_ractor_local_storage_value/set are used to access a VALUE and rb_ractor_local_storage_ptr/set are used to access a pointer. random.c uses this API.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3822
Diffstat (limited to 'ractor.c')
-rw-r--r--ractor.c224
1 files changed, 201 insertions, 23 deletions
diff --git a/ractor.c b/ractor.c
index 6b46d4ba95..4a75b41fc5 100644
--- a/ractor.c
+++ b/ractor.c
@@ -177,6 +177,9 @@ ractor_queue_mark(struct rb_ractor_queue *rq)
}
}
+static void ractor_local_storage_mark(rb_ractor_t *r);
+static void ractor_local_storage_free(rb_ractor_t *r);
+
static void
ractor_mark(void *ptr)
{
@@ -201,10 +204,7 @@ ractor_mark(void *ptr)
}
}
- if (r->default_rand) {
- void rb_default_rand_mark(void *); // random.c
- rb_default_rand_mark(r->default_rand);
- }
+ ractor_local_storage_mark(r);
}
static void
@@ -227,7 +227,7 @@ ractor_free(void *ptr)
rb_native_cond_destroy(&r->wait.cond);
ractor_queue_free(&r->incoming_queue);
ractor_waiting_list_free(&r->taking_ractors);
- if (r->default_rand) ruby_xfree(r->default_rand);
+ ractor_local_storage_free(r);
ruby_xfree(r);
}
@@ -1773,24 +1773,6 @@ rb_ractor_stderr_set(VALUE err)
}
}
-struct rb_random_struct *
-rb_ractor_default_rand(struct rb_random_struct *ptr)
-{
- if (rb_ractor_main_p()) {
- static struct rb_random_struct *default_rnd;
- if (UNLIKELY(ptr != NULL)) {
- rb_ractor_t *cr = GET_RACTOR();
- cr->default_rand = default_rnd = ptr;
- }
- return default_rnd;
- }
- else {
- rb_ractor_t *cr = GET_RACTOR();
- if (UNLIKELY(ptr != NULL)) cr->default_rand = ptr;
- return cr->default_rand;
- }
-}
-
/// traverse function
// 2: stop search
@@ -2566,4 +2548,200 @@ static VALUE ractor_copy(VALUE obj)
}
}
+// Ractor local storage
+
+struct rb_ractor_local_key_struct {
+ const struct rb_ractor_local_storage_type *type;
+ void *main_cache;
+};
+
+static struct freed_ractor_local_keys_struct {
+ int cnt;
+ int capa;
+ rb_ractor_local_key_t *keys;
+} freed_ractor_local_keys;
+
+static int
+ractor_local_storage_mark_i(st_data_t key, st_data_t val, st_data_t dmy)
+{
+ struct rb_ractor_local_key_struct *k = (struct rb_ractor_local_key_struct *)key;
+ if (k->type->mark) (*k->type->mark)((void *)val);
+ return ST_CONTINUE;
+}
+
+static void
+ractor_local_storage_mark(rb_ractor_t *r)
+{
+ if (r->local_storage) {
+ st_foreach(r->local_storage, ractor_local_storage_mark_i, 0);
+
+ for (int i=0; i<freed_ractor_local_keys.cnt; i++) {
+ rb_ractor_local_key_t key = freed_ractor_local_keys.keys[i];
+ st_data_t val;
+ if (st_delete(r->local_storage, (st_data_t *)&key, &val) &&
+ key->type->free) {
+ (*key->type->free)((void *)val);
+ }
+ }
+ }
+}
+
+static int
+ractor_local_storage_free_i(st_data_t key, st_data_t val, st_data_t dmy)
+{
+ struct rb_ractor_local_key_struct *k = (struct rb_ractor_local_key_struct *)key;
+ if (k->type->free) (*k->type->free)((void *)val);
+ return ST_CONTINUE;
+}
+
+static void
+ractor_local_storage_free(rb_ractor_t *r)
+{
+ if (r->local_storage) {
+ st_foreach(r->local_storage, ractor_local_storage_free_i, 0);
+ st_free_table(r->local_storage);
+ }
+}
+
+static void
+rb_ractor_local_storage_value_mark(void *ptr)
+{
+ rb_gc_mark((VALUE)ptr);
+}
+
+static const struct rb_ractor_local_storage_type ractor_local_storage_type_null = {
+ NULL,
+ NULL,
+};
+
+const struct rb_ractor_local_storage_type rb_ractor_local_storage_type_free = {
+ NULL,
+ ruby_xfree,
+};
+
+static const struct rb_ractor_local_storage_type ractor_local_storage_type_value = {
+ rb_ractor_local_storage_value_mark,
+ NULL,
+};
+
+rb_ractor_local_key_t
+rb_ractor_local_storage_ptr_newkey(const struct rb_ractor_local_storage_type *type)
+{
+ rb_ractor_local_key_t key = ALLOC(struct rb_ractor_local_key_struct);
+ key->type = type ? type : &ractor_local_storage_type_null;
+ key->main_cache = (void *)Qundef;
+ return key;
+}
+
+rb_ractor_local_key_t
+rb_ractor_local_storage_value_newkey(void)
+{
+ return rb_ractor_local_storage_ptr_newkey(&ractor_local_storage_type_value);
+}
+
+void
+rb_ractor_local_storage_delkey(rb_ractor_local_key_t key)
+{
+ RB_VM_LOCK_ENTER();
+ {
+ if (freed_ractor_local_keys.cnt == freed_ractor_local_keys.capa) {
+ freed_ractor_local_keys.capa = freed_ractor_local_keys.capa ? freed_ractor_local_keys.capa * 2 : 4;
+ REALLOC_N(freed_ractor_local_keys.keys, rb_ractor_local_key_t, freed_ractor_local_keys.capa);
+ }
+ freed_ractor_local_keys.keys[freed_ractor_local_keys.cnt++] = key;
+ }
+ RB_VM_LOCK_LEAVE();
+}
+
+static bool
+ractor_local_ref(rb_ractor_local_key_t key, void **pret)
+{
+ if (rb_ractor_main_p()) {
+ if ((VALUE)key->main_cache != Qundef) {
+ *pret = key->main_cache;
+ return true;
+ }
+ else {
+ return false;
+ }
+ }
+ else {
+ rb_ractor_t *cr = GET_RACTOR();
+
+ if (cr->local_storage && st_lookup(cr->local_storage, (st_data_t)key, (st_data_t *)pret)) {
+ return true;
+ }
+ else {
+ return false;
+ }
+ }
+}
+
+static void
+ractor_local_set(rb_ractor_local_key_t key, void *ptr)
+{
+ rb_ractor_t *cr = GET_RACTOR();
+
+ if (cr->local_storage == NULL) {
+ cr->local_storage = st_init_numtable();
+ }
+
+ st_insert(cr->local_storage, (st_data_t)key, (st_data_t)ptr);
+
+ if (rb_ractor_main_p()) {
+ key->main_cache = ptr;
+ }
+}
+
+VALUE
+rb_ractor_local_storage_value(rb_ractor_local_key_t key)
+{
+ VALUE val;
+ if (ractor_local_ref(key, (void **)&val)) {
+ return val;
+ }
+ else {
+ return Qnil;
+ }
+}
+
+void
+rb_ractor_local_storage_value_set(rb_ractor_local_key_t key, VALUE val)
+{
+ ractor_local_set(key, (void *)val);
+}
+
+void *
+rb_ractor_local_storage_ptr(rb_ractor_local_key_t key)
+{
+ void *ret;
+ if (ractor_local_ref(key, &ret)) {
+ return ret;
+ }
+ else {
+ return NULL;
+ }
+}
+
+void
+rb_ractor_local_storage_ptr_set(rb_ractor_local_key_t key, void *ptr)
+{
+ ractor_local_set(key, ptr);
+}
+
+#define DEFAULT_KEYS_CAPA 0x10
+
+void
+rb_ractor_finish_marking(void)
+{
+ for (int i=0; i<freed_ractor_local_keys.cnt; i++) {
+ ruby_xfree(freed_ractor_local_keys.keys[i]);
+ }
+ freed_ractor_local_keys.cnt = 0;
+ if (freed_ractor_local_keys.capa > DEFAULT_KEYS_CAPA) {
+ freed_ractor_local_keys.capa = DEFAULT_KEYS_CAPA;
+ REALLOC_N(freed_ractor_local_keys.keys, rb_ractor_local_key_t, DEFAULT_KEYS_CAPA);
+ }
+}
+
#include "ractor.rbinc"