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 --- test/ruby/test_thread.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'test') diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 145e021790..518ad40333 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -863,4 +863,19 @@ class TestThreadGroup < Test::Unit::TestCase end assert_in_delta(t1 - t0, 1, 1, bug5757) end + + def test_thread_join_in_trap + assert_raise(ThreadError) { + t = Thread.new{ sleep 0.2; Process.kill(:INT, $$) } + + Signal.trap :INT do + t.join + end + + t.join + } + end + + + end -- cgit v1.2.3