From f150ed1532e727c409cc018a98e1362a8c71242c Mon Sep 17 00:00:00 2001 From: kosaki Date: Mon, 26 Nov 2012 08:05:49 +0000 Subject: * vm_core.h (rb_thread_struct): added 'in_trap' member for marking running trap handler. * signal.c (signal_exec): turn on in_trap when running trap. * thread.c (Init_Thread, thread_create_core): initialize in_trap when creating new threads. * thread.c (thread_join_m): raise ThreadError when running trap handler.Bug [#6416][ruby-core:44956] * test/ruby/test_thread.rb (test_thread_join_in_trap): new test for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- signal.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'signal.c') diff --git a/signal.c b/signal.c index d97d297c1c..9f1717e012 100644 --- a/signal.c +++ b/signal.c @@ -17,6 +17,7 @@ #include #include #include "ruby_atomic.h" +#include "eval_intern.h" #if defined(__native_client__) && defined(NACL_NEWLIB) # include "nacl/signal.h" @@ -623,7 +624,22 @@ static void signal_exec(VALUE cmd, int safe, int sig) { VALUE signum = INT2NUM(sig); - rb_eval_cmd(cmd, rb_ary_new3(1, signum), safe); + rb_thread_t *cur_th = GET_THREAD(); + int old_in_trap = cur_th->in_trap; + int state; + + cur_th->in_trap = 1; + TH_PUSH_TAG(cur_th); + if ((state = EXEC_TAG()) == 0) { + rb_eval_cmd(cmd, rb_ary_new3(1, signum), safe); + } + TH_POP_TAG(); + cur_th->in_trap = old_in_trap; + + if (state) { + /* XXX: should be replaced with rb_threadptr_async_errinfo_enque() */ + JUMP_TAG(state); + } } void -- cgit v1.2.3