diff options
Diffstat (limited to 'ractor_core.h')
| -rw-r--r-- | ractor_core.h | 218 |
1 files changed, 85 insertions, 133 deletions
diff --git a/ractor_core.h b/ractor_core.h index 36c0e91c7a..c692ebbbbf 100644 --- a/ractor_core.h +++ b/ractor_core.h @@ -9,122 +9,39 @@ #define RACTOR_CHECK_MODE (VM_CHECK_MODE || RUBY_DEBUG) && (SIZEOF_UINT64_T == SIZEOF_VALUE) #endif -enum rb_ractor_basket_type { - // basket is empty - basket_type_none, - - // value is available - basket_type_ref, - basket_type_copy, - basket_type_move, - basket_type_will, - - // basket should be deleted - basket_type_deleted, - - // basket is reserved - basket_type_reserved, - - // take_basket is available - basket_type_take_basket, - - // basket is keeping by yielding ractor - basket_type_yielding, -}; - -// per ractor taking configuration -struct rb_ractor_selector_take_config { - bool closed; - bool oneshot; -}; - -struct rb_ractor_basket { - union { - enum rb_ractor_basket_type e; - rb_atomic_t atomic; - } type; - VALUE sender; - - union { - struct { - VALUE v; - bool exception; - } send; - - struct { - struct rb_ractor_basket *basket; - struct rb_ractor_selector_take_config *config; - } take; - } p; // payload -}; - -static inline bool -basket_type_p(struct rb_ractor_basket *b, enum rb_ractor_basket_type type) -{ - return b->type.e == type; -} - -static inline bool -basket_none_p(struct rb_ractor_basket *b) -{ - return basket_type_p(b, basket_type_none); -} - -struct rb_ractor_queue { - struct rb_ractor_basket *baskets; - int start; - int cnt; - int size; - unsigned int serial; - unsigned int reserved_cnt; -}; - -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 - bool incoming_port_closed; - bool outgoing_port_closed; +#ifndef RUBY_THREAD_PTHREAD_H + rb_nativethread_cond_t wakeup_cond; +#endif - // All sent messages will be pushed into recv_queue - struct rb_ractor_queue recv_queue; + // incoming messages + struct ractor_queue *recv_queue; - // The following ractors waiting for the yielding by this ractor - struct rb_ractor_queue takers_queue; + // waiting threads for receiving + struct ccan_list_head waiters; - // Enabled if the ractor already terminated and not taken yet. - struct rb_ractor_basket will_basket; + // 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; - rb_thread_t *waiting_thread; - } wait; + // monitors + struct ccan_list_head monitors; -#ifndef RUBY_THREAD_PTHREAD_H - rb_nativethread_cond_t cond; -#endif + // value + rb_ractor_t *successor; + VALUE legacy; + bool legacy_exc; }; // created @@ -150,12 +67,7 @@ enum ractor_status { struct rb_ractor_struct { struct rb_ractor_pub pub; - struct rb_ractor_sync sync; - VALUE receiving_mutex; - - // vm wide barrier synchronization - rb_nativethread_cond_t barrier_wait_cond; // thread management struct { @@ -167,6 +79,7 @@ struct rb_ractor_struct { rb_execution_context_t *running_ec; rb_thread_t *main; } threads; + VALUE thgroup_default; VALUE name; @@ -178,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; @@ -187,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) @@ -227,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!! @@ -283,12 +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", @@ -299,28 +233,21 @@ 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 @@ -338,6 +265,25 @@ rb_ractor_id(const rb_ractor_t *r) return r->pub.id; } +static inline void +rb_ractor_targeted_hooks_incr(rb_ractor_t *cr) +{ + cr->pub.targeted_hooks_cnt++; +} + +static inline void +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) +{ + 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))) @@ -349,12 +295,6 @@ rb_ractor_setup_belonging_to(VALUE obj, uint32_t rid) RACTOR_BELONGING_ID(obj) = rid; } -static inline void -rb_ractor_setup_belonging(VALUE obj) -{ - rb_ractor_setup_belonging_to(obj, rb_ractor_current_id()); -} - static inline uint32_t rb_ractor_belonging(VALUE obj) { @@ -366,9 +306,13 @@ rb_ractor_belonging(VALUE 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) { @@ -388,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 |