diff options
Diffstat (limited to 'ractor_core.h')
| -rw-r--r-- | ractor_core.h | 192 |
1 files changed, 98 insertions, 94 deletions
diff --git a/ractor_core.h b/ractor_core.h index a065f5f809..c692ebbbbf 100644 --- a/ractor_core.h +++ b/ractor_core.h @@ -1,3 +1,4 @@ +#include "internal/gc.h" #include "ruby/ruby.h" #include "ruby/ractor.h" #include "vm_core.h" @@ -8,77 +9,39 @@ #define RACTOR_CHECK_MODE (VM_CHECK_MODE || RUBY_DEBUG) && (SIZEOF_UINT64_T == SIZEOF_VALUE) #endif -enum rb_ractor_basket_type { - basket_type_none, - basket_type_ref, - basket_type_copy, - basket_type_move, - basket_type_will, - basket_type_deleted, - basket_type_reserved, -}; - -struct rb_ractor_basket { - bool exception; - enum rb_ractor_basket_type type; - VALUE v; - VALUE sender; -}; - -struct rb_ractor_queue { - struct rb_ractor_basket *baskets; - int start; - int cnt; - int size; - unsigned int serial; - unsigned int reserved_cnt; -}; - -struct rb_ractor_waiting_list { - int cnt; - int size; - rb_ractor_t **ractors; -}; - -enum rb_ractor_wait_status { - wait_none = 0x00, - wait_receiving = 0x01, - wait_taking = 0x02, - wait_yielding = 0x04, - wait_moving = 0x08, -}; - -enum rb_ractor_wakeup_status { - wakeup_none, - wakeup_by_send, - wakeup_by_yield, - wakeup_by_take, - wakeup_by_close, - wakeup_by_interrupt, - wakeup_by_retry, -}; +// experimental flag because it is not sure it is the common pattern +#define RUBY_TYPED_FROZEN_SHAREABLE_NO_REC RUBY_FL_FINALIZE struct rb_ractor_sync { // ractor lock rb_nativethread_lock_t lock; + #if RACTOR_CHECK_MODE > 0 VALUE locked_by; #endif - rb_nativethread_cond_t cond; - // communication - struct rb_ractor_queue incoming_queue; - struct rb_ractor_waiting_list taking_ractors; +#ifndef RUBY_THREAD_PTHREAD_H + rb_nativethread_cond_t wakeup_cond; +#endif + + // incoming messages + struct ractor_queue *recv_queue; + + // waiting threads for receiving + struct ccan_list_head waiters; - bool incoming_port_closed; - bool outgoing_port_closed; + // ports + VALUE default_port_value; + struct st_table *ports; + size_t next_port_id; - struct ractor_wait { - enum rb_ractor_wait_status status; - enum rb_ractor_wakeup_status wakeup_status; - struct rb_ractor_basket yielded_basket; - struct rb_ractor_basket taken_basket; - } wait; + // monitors + struct ccan_list_head monitors; + + // value + rb_ractor_t *successor; + VALUE legacy; + bool legacy_exc; }; // created @@ -104,13 +67,7 @@ enum ractor_status { struct rb_ractor_struct { struct rb_ractor_pub pub; - struct rb_ractor_sync sync; - VALUE receiving_mutex; - bool yield_atexit; - - // vm wide barrier synchronization - rb_nativethread_cond_t barrier_wait_cond; // thread management struct { @@ -122,6 +79,7 @@ struct rb_ractor_struct { rb_execution_context_t *running_ec; rb_thread_t *main; } threads; + VALUE thgroup_default; VALUE name; @@ -133,8 +91,11 @@ struct rb_ractor_struct { // ractor local data + rb_serial_t next_ec_serial; + st_table *local_storage; struct rb_id_table *idkey_local_storage; + VALUE local_storage_store_lock; VALUE r_stdin; VALUE r_stdout; @@ -142,15 +103,24 @@ struct rb_ractor_struct { VALUE verbose; VALUE debug; - rb_ractor_newobj_cache_t newobj_cache; - - // gc.c rb_objspace_reachable_objects_from - struct gc_mark_func_data_struct { - void *data; - void (*mark_func)(VALUE v, void *data); - } *mfd; + bool malloc_gc_disabled; + bool main_ractor; + void *newobj_cache; }; // rb_ractor_t is defined in vm_core.h +enum ractor_wakeup_status { + wakeup_none, + wakeup_by_send, + wakeup_by_interrupt, + // wakeup_by_close, +}; + +struct ractor_waiter { + enum ractor_wakeup_status wakeup_status; + rb_thread_t *th; + struct ccan_list_node node; + rb_atomic_t event_serial; +}; static inline VALUE rb_ractor_self(const rb_ractor_t *r) @@ -169,7 +139,7 @@ void rb_ractor_send_parameters(rb_execution_context_t *ec, rb_ractor_t *g, VALUE VALUE rb_thread_create_ractor(rb_ractor_t *g, VALUE args, VALUE proc); // defined in thread.c int rb_ractor_living_thread_num(const rb_ractor_t *); -VALUE rb_ractor_thread_list(rb_ractor_t *r); +VALUE rb_ractor_thread_list(void); bool rb_ractor_p(VALUE rv); void rb_ractor_living_threads_init(rb_ractor_t *r); @@ -182,12 +152,17 @@ void rb_ractor_vm_barrier_interrupt_running_thread(rb_ractor_t *r); void rb_ractor_terminate_interrupt_main_thread(rb_ractor_t *r); void rb_ractor_terminate_all(void); bool rb_ractor_main_p_(void); -void rb_ractor_finish_marking(void); void rb_ractor_atfork(rb_vm_t *vm, rb_thread_t *th); +void rb_ractor_terminate_atfork(rb_vm_t *vm, rb_ractor_t *th); +VALUE rb_ractor_require(VALUE feature, bool silent); +VALUE rb_ractor_autoload_load(VALUE space, ID id); VALUE rb_ractor_ensure_shareable(VALUE obj, VALUE name); +st_table *rb_ractor_targeted_hooks(rb_ractor_t *cr); RUBY_SYMBOL_EXPORT_BEGIN +void rb_ractor_finish_marking(void); + bool rb_ractor_shareable_p_continue(VALUE obj); // THIS FUNCTION SHOULD NOT CALL WHILE INCREMENTAL MARKING!! @@ -238,8 +213,16 @@ rb_ractor_sleeper_thread_num(rb_ractor_t *r) } static inline void -rb_ractor_thread_switch(rb_ractor_t *cr, rb_thread_t *th) +rb_ractor_thread_switch(rb_ractor_t *cr, rb_thread_t *th, bool always_reset) { + RUBY_DEBUG_LOG("th:%d->%u%s", + cr->threads.running_ec ? (int)rb_th_serial(cr->threads.running_ec->thread_ptr) : -1, + rb_th_serial(th), cr->threads.running_ec == th->ec ? " (same)" : ""); + + if (cr->threads.running_ec != th->ec || always_reset) { + th->running_time_us = 0; + } + if (cr->threads.running_ec != th->ec) { if (0) { ruby_debug_printf("rb_ractor_thread_switch ec:%p->%p\n", @@ -250,31 +233,26 @@ rb_ractor_thread_switch(rb_ractor_t *cr, rb_thread_t *th) return; } - if (cr->threads.running_ec != th->ec) { - th->running_time_us = 0; - } - cr->threads.running_ec = th->ec; VM_ASSERT(cr == GET_RACTOR()); } #define rb_ractor_set_current_ec(cr, ec) rb_ractor_set_current_ec_(cr, ec, __FILE__, __LINE__) +#ifdef RB_THREAD_LOCAL_SPECIFIER +void rb_current_ec_set(rb_execution_context_t *ec); +#endif static inline void rb_ractor_set_current_ec_(rb_ractor_t *cr, rb_execution_context_t *ec, const char *file, int line) { #ifdef RB_THREAD_LOCAL_SPECIFIER - #ifdef __APPLE__ rb_current_ec_set(ec); - #else - ruby_current_ec = ec; - #endif #else native_tls_set(ruby_current_ec_key, ec); #endif RUBY_DEBUG_LOG2(file, line, "ec:%p->%p", (void *)cr->threads.running_ec, (void *)ec); - VM_ASSERT(cr->threads.running_ec != ec); + VM_ASSERT(ec == NULL || cr->threads.running_ec != ec); cr->threads.running_ec = ec; } @@ -287,20 +265,34 @@ rb_ractor_id(const rb_ractor_t *r) return r->pub.id; } -#if RACTOR_CHECK_MODE > 0 -uint32_t rb_ractor_current_id(void); +static inline void +rb_ractor_targeted_hooks_incr(rb_ractor_t *cr) +{ + cr->pub.targeted_hooks_cnt++; +} static inline void -rb_ractor_setup_belonging_to(VALUE obj, uint32_t rid) +rb_ractor_targeted_hooks_decr(rb_ractor_t *cr) +{ + RUBY_ASSERT(cr->pub.targeted_hooks_cnt > 0); + cr->pub.targeted_hooks_cnt--; +} + +static inline unsigned int +rb_ractor_targeted_hooks_cnt(rb_ractor_t *cr) { - VALUE flags = RBASIC(obj)->flags & 0xffffffff; // 4B - RBASIC(obj)->flags = flags | ((VALUE)rid << 32); + return cr->pub.targeted_hooks_cnt; } +#if RACTOR_CHECK_MODE > 0 +# define RACTOR_BELONGING_ID(obj) (*(uint32_t *)(((uintptr_t)(obj)) + rb_gc_obj_slot_size(obj))) + +uint32_t rb_ractor_current_id(void); + static inline void -rb_ractor_setup_belonging(VALUE obj) +rb_ractor_setup_belonging_to(VALUE obj, uint32_t rid) { - rb_ractor_setup_belonging_to(obj, rb_ractor_current_id()); + RACTOR_BELONGING_ID(obj) = rid; } static inline uint32_t @@ -310,13 +302,17 @@ rb_ractor_belonging(VALUE obj) return 0; } else { - return RBASIC(obj)->flags >> 32; + return RACTOR_BELONGING_ID(obj); } } +extern bool rb_ractor_ignore_belonging_flag; + static inline VALUE rb_ractor_confirm_belonging(VALUE obj) { + if (rb_ractor_ignore_belonging_flag) return obj; + uint32_t id = rb_ractor_belonging(obj); if (id == 0) { @@ -336,6 +332,14 @@ rb_ractor_confirm_belonging(VALUE obj) } return obj; } + +static inline void +rb_ractor_ignore_belonging(bool flag) +{ + rb_ractor_ignore_belonging_flag = flag; +} + #else #define rb_ractor_confirm_belonging(obj) obj +#define rb_ractor_ignore_belonging(flag) (0) #endif |