diff options
| -rw-r--r-- | thread.c | 10 | ||||
| -rw-r--r-- | thread_pthread.c | 12 | ||||
| -rw-r--r-- | thread_win32.c | 10 | ||||
| -rw-r--r-- | thread_win32.h | 2 | ||||
| -rw-r--r-- | vm_core.h | 22 |
5 files changed, 34 insertions, 22 deletions
@@ -341,7 +341,6 @@ rb_thread_s_debug_set(VALUE self, VALUE val) #endif NOINLINE(static int thread_start_func_2(rb_thread_t *th, VALUE *stack_start)); -static void timer_thread_function(rb_execution_context_t *ec); void ruby_sigchld_handler(rb_vm_t *); /* signal.c */ static void @@ -4575,15 +4574,6 @@ rb_threadptr_check_signal(rb_thread_t *mth) } static void -timer_thread_function(rb_execution_context_t *ec) -{ - // strictly speaking, accessing gvl->owner is not thread-safe - if (ec) { - RUBY_VM_SET_TIMER_INTERRUPT(ec); - } -} - -static void async_bug_fd(const char *mesg, int errno_arg, int fd) { char buff[64]; diff --git a/thread_pthread.c b/thread_pthread.c index 71667aec69..97879f559a 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -194,6 +194,7 @@ designate_timer_thread(rb_global_vm_lock_t *gvl) static void do_gvl_timer(rb_global_vm_lock_t *gvl, rb_thread_t *th) { + rb_vm_t *vm = GET_VM(); static rb_hrtime_t abs; native_thread_data_t *nd = &th->native_thread_data; @@ -208,14 +209,14 @@ do_gvl_timer(rb_global_vm_lock_t *gvl, rb_thread_t *th) gvl->timer_err = native_cond_timedwait(&nd->cond.gvlq, &gvl->lock, &abs); ubf_wakeup_all_threads(); - ruby_sigchld_handler(GET_VM()); + ruby_sigchld_handler(vm); if (UNLIKELY(rb_signal_buff_size())) { - if (th == GET_VM()->ractor.main_thread) { + if (th == vm->ractor.main_thread) { RUBY_VM_SET_TRAP_INTERRUPT(th->ec); } else { - threadptr_trap_interrupt(GET_VM()->ractor.main_thread); + threadptr_trap_interrupt(vm->ractor.main_thread); } } @@ -223,7 +224,10 @@ do_gvl_timer(rb_global_vm_lock_t *gvl, rb_thread_t *th) * Timeslice. Warning: the process may fork while this * thread is contending for GVL: */ - if (gvl->owner) timer_thread_function(gvl->owner->ec); + if (gvl->owner) { + // strictly speaking, accessing "gvl->owner" is not thread-safe + RUBY_VM_SET_TIMER_INTERRUPT(gvl->owner->ec); + } gvl->timer = 0; } diff --git a/thread_win32.c b/thread_win32.c index 9b80bfc1f8..132e52cae3 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -710,13 +710,9 @@ timer_thread_func(void *dummy) rb_vm_t *vm = GET_VM(); thread_debug("timer_thread\n"); rb_w32_set_thread_description(GetCurrentThread(), L"ruby-timer-thread"); - while (WaitForSingleObject(timer_thread.lock, TIME_QUANTUM_USEC/1000) == - WAIT_TIMEOUT) { - rb_execution_context_t *running_ec = vm->ractor.main_ractor->threads.running_ec; - - if (running_ec) { - timer_thread_function(running_ec); - } + while (WaitForSingleObject(timer_thread.lock, + TIME_QUANTUM_USEC/1000) == WAIT_TIMEOUT) { + vm->clock++; ruby_sigchld_handler(vm); /* probably no-op */ rb_threadptr_check_signal(vm->ractor.main_thread); } diff --git a/thread_win32.h b/thread_win32.h index cdcc159b2d..bc8eea7801 100644 --- a/thread_win32.h +++ b/thread_win32.h @@ -16,6 +16,8 @@ # undef _WIN32 # endif +#define USE_VM_CLOCK 1 + WINBASEAPI BOOL WINAPI TryEnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection); @@ -649,6 +649,10 @@ typedef struct rb_vm_struct { const struct rb_builtin_function *builtin_function_table; int builtin_inline_index; +#if USE_VM_CLOCK + uint32_t clock; +#endif + /* params */ struct { /* size in byte */ size_t thread_vm_stack_size; @@ -845,6 +849,9 @@ struct rb_execution_context_struct { /* interrupt flags */ rb_atomic_t interrupt_flag; rb_atomic_t interrupt_mask; /* size should match flag */ +#if USE_VM_CLOCK + uint32_t checked_clock; +#endif rb_fiber_t *fiber_ptr; struct rb_thread_struct *thread_ptr; @@ -1845,7 +1852,20 @@ enum { #define RUBY_VM_SET_VM_BARRIER_INTERRUPT(ec) ATOMIC_OR((ec)->interrupt_flag, VM_BARRIER_INTERRUPT_MASK) #define RUBY_VM_INTERRUPTED(ec) ((ec)->interrupt_flag & ~(ec)->interrupt_mask & \ (PENDING_INTERRUPT_MASK|TRAP_INTERRUPT_MASK)) -#define RUBY_VM_INTERRUPTED_ANY(ec) ((ec)->interrupt_flag & ~(ec)->interrupt_mask) + +static inline bool +RUBY_VM_INTERRUPTED_ANY(rb_execution_context_t *ec) +{ +#if USE_VM_CLOCK + uint32_t current_clock = rb_ec_vm_ptr(ec)->clock; + + if (current_clock != ec->checked_clock) { + ec->checked_clock = current_clock; + RUBY_VM_SET_TIMER_INTERRUPT(ec); + } +#endif + return ec->interrupt_flag & ~(ec)->interrupt_mask; +} VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt); int rb_signal_buff_size(void); |