diff options
| -rw-r--r-- | thread.c | 15 | ||||
| -rw-r--r-- | vm_core.h | 11 |
2 files changed, 15 insertions, 11 deletions
@@ -164,6 +164,21 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio }; \ } while(0) +#define RUBY_VM_CHECK_INTS_BLOCKING(th) vm_check_ints_blocking(th) +static inline void +vm_check_ints_blocking(rb_thread_t *th) +{ + if (UNLIKELY(!rb_threadptr_pending_interrupt_empty_p(th))) { + th->pending_interrupt_queue_checked = 0; + + RUBY_VM_SET_INTERRUPT(th); + rb_threadptr_execute_interrupts(th, 1); + } + else if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(th))) { + rb_threadptr_execute_interrupts(th, 1); + } +} + #if THREAD_DEBUG #ifdef HAVE_VA_ARGS_MACRO void rb_thread_debug(const char *file, int line, const char *fmt, ...); @@ -1090,17 +1090,6 @@ void rb_threadptr_pending_interrupt_clear(rb_thread_t *th); void rb_threadptr_pending_interrupt_enque(rb_thread_t *th, VALUE v); int rb_threadptr_pending_interrupt_active_p(rb_thread_t *th); -#define RUBY_VM_CHECK_INTS_BLOCKING(th) do { \ - if (UNLIKELY(!rb_threadptr_pending_interrupt_empty_p(th))) { \ - th->pending_interrupt_queue_checked = 0; \ - RUBY_VM_SET_INTERRUPT(th); \ - rb_threadptr_execute_interrupts(th, 1); \ - } \ - else if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(th))) { \ - rb_threadptr_execute_interrupts(th, 1); \ - } \ - } while (0) - #define RUBY_VM_CHECK_INTS(th) do { \ if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(th))) { \ rb_threadptr_execute_interrupts(th, 0); \ |