From 5dfdaa92994096ac7c6713ebd77413271ff4bc41 Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 6 Nov 2017 07:44:28 +0000 Subject: move rb_thread_t::interrupt_flag and mask to rb_execution_context_t. * vm_core.h (rb_thread_t): move `rb_thread_t::interrupt_flag` and `rb_thread_t::interrupt_mask` to rb_execution_context_t. RUBY_VM_CHECK_INTS() accepts `ec` instead of `th`. * cont.c (rb_fiber_terminate): to propagate interrupt information, add new parameter `need_interrupt`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- signal.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'signal.c') diff --git a/signal.c b/signal.c index 5a8ccf5771..b67317aa6f 100644 --- a/signal.c +++ b/signal.c @@ -987,8 +987,8 @@ sig_do_nothing(int sig) static void signal_exec(VALUE cmd, int safe, int sig) { - rb_thread_t *cur_th = GET_THREAD(); - volatile unsigned long old_interrupt_mask = cur_th->interrupt_mask; + rb_execution_context_t *ec = GET_EC(); + volatile unsigned long old_interrupt_mask = ec->interrupt_mask; enum ruby_tag_type state; /* @@ -1000,19 +1000,19 @@ signal_exec(VALUE cmd, int safe, int sig) if (IMMEDIATE_P(cmd)) return; - cur_th->interrupt_mask |= TRAP_INTERRUPT_MASK; - EC_PUSH_TAG(cur_th->ec); + ec->interrupt_mask |= TRAP_INTERRUPT_MASK; + EC_PUSH_TAG(ec); if ((state = EXEC_TAG()) == TAG_NONE) { VALUE signum = INT2NUM(sig); rb_eval_cmd(cmd, rb_ary_new3(1, signum), safe); } EC_POP_TAG(); - cur_th = GET_THREAD(); - cur_th->interrupt_mask = old_interrupt_mask; + ec = GET_EC(); + ec->interrupt_mask = old_interrupt_mask; if (state) { /* XXX: should be replaced with rb_threadptr_pending_interrupt_enque() */ - EC_JUMP_TAG(cur_th->ec, state); + EC_JUMP_TAG(ec, state); } } -- cgit v1.2.3