From 66e2e6ee697a322bb7521d7ecaff6be3fb69f4dd Mon Sep 17 00:00:00 2001 From: kosaki Date: Mon, 26 Nov 2012 12:17:10 +0000 Subject: * vm_core.h (RUBY_VM_SET_TIMER_INTERRUPT, RUBY_VM_SET_INTERRUPT) (RUBY_VM_SET_FINALIZER_INTERRUPT, RUBY_VM_SET_TRAP_INTERRUPT) (RUBY_VM_INTERRUPTED): use enum symbol instead of immediate value. * thread.c (thread_join_m, rb_threadptr_execute_interrupts): ditto. * signal.c (signal_exec): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index 3264548480..0ff0794785 100644 --- a/thread.c +++ b/thread.c @@ -810,7 +810,8 @@ thread_join_m(int argc, VALUE *argv, VALUE self) double delay = DELAY_INFTY; VALUE limit; - if (cur_th->interrupt_mask & 0x08) { + /* When running trap handler */ + if (cur_th->interrupt_mask & TRAP_INTERRUPT_MASK) { rb_raise(rb_eThreadError, "can't be called from trap context"); } @@ -1747,10 +1748,10 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing) if (!interrupt) return; - timer_interrupt = interrupt & 0x01; - async_errinfo_interrupt = interrupt & 0x02; - finalizer_interrupt = interrupt & 0x04; - trap_interrupt = interrupt & 0x08; + timer_interrupt = interrupt & TIMER_INTERRUPT_MASK; + async_errinfo_interrupt = interrupt & ASYNC_ERRINFO_INTERRUPT_MASK; + finalizer_interrupt = interrupt & FINALIZER_INTERRUPT_MASK; + trap_interrupt = interrupt & TRAP_INTERRUPT_MASK; th->status = THREAD_RUNNABLE; -- cgit v1.2.3