diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-26 11:45:39 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-26 11:45:39 +0000 |
commit | 58543f00b6386b5631ffc6d8f029be149d632457 (patch) | |
tree | b87816cbf20e9607e7436ac0a62d85c6c244b04c /signal.c | |
parent | 12d48f4ef242eaa48844e9dbbbd5ae22b87870c3 (diff) | |
download | ruby-58543f00b6386b5631ffc6d8f029be149d632457.tar.gz |
* thread.c (thread_join_m): use th->interrupt_mask instead of
th->in_trap.
* vm_core.h (struct rb_thread_struct): remove in_trap member.
* signal.c (signal_exec): ditto.
* thread.c (thread_create_core): ditto.
* thread.c (Init_Thread): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'signal.c')
-rw-r--r-- | signal.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -624,11 +624,9 @@ static void signal_exec(VALUE cmd, int safe, int sig) { rb_thread_t *cur_th = GET_THREAD(); - volatile int old_in_trap = cur_th->in_trap; volatile unsigned long old_interrupt_mask = cur_th->interrupt_mask; int state; - cur_th->in_trap = 1; cur_th->interrupt_mask |= 0x08; TH_PUSH_TAG(cur_th); if ((state = EXEC_TAG()) == 0) { @@ -638,7 +636,6 @@ signal_exec(VALUE cmd, int safe, int sig) TH_POP_TAG(); cur_th = GET_THREAD(); cur_th->interrupt_mask = old_interrupt_mask; - cur_th->in_trap = old_in_trap; if (state) { /* XXX: should be replaced with rb_threadptr_async_errinfo_enque() */ |