diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-06 07:44:28 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-06 07:44:28 +0000 |
commit | 5dfdaa92994096ac7c6713ebd77413271ff4bc41 (patch) | |
tree | e8d9634d0184a97f1d342a65b20207b03d272b20 /signal.c | |
parent | 5845bd6a718573da5f0f7e53368d2a1dda52f420 (diff) |
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
Diffstat (limited to 'signal.c')
-rw-r--r-- | signal.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -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); } } |