diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-10 08:15:39 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-10 08:15:39 +0000 |
commit | 38bc085f71ad2056f259ec60e4920acab392506b (patch) | |
tree | 0300a4c7be4944f68d3f278c229d1cb5f67fb338 | |
parent | 92b710e64bf194266e3354c06fdb16dc7de0196d (diff) | |
download | ruby-38bc085f71ad2056f259ec60e4920acab392506b.tar.gz |
check thread deadness correctly.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/ruby/test_thread.rb | 10 | ||||
-rw-r--r-- | thread.c | 7 |
2 files changed, 17 insertions, 0 deletions
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 9daff2d866..d7b5dadf81 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -1160,4 +1160,14 @@ q.pop c = Class.new(Thread) {def initialize() self.name = "foo"; super; end} assert_equal("foo", c.new {Thread.current.name}.value, bug12290) end + + def test_thread_interrupt_for_killed_thread + assert_normal_exit(<<-_end, '[Bug #8996]', timeout: 5, timeout_error: nil) + trap(:TERM){exit} + while true + t = Thread.new{sleep 0} + t.raise Interrupt + end + _end + end end @@ -2107,6 +2107,13 @@ rb_threadptr_raise(rb_thread_t *th, int argc, VALUE *argv) else { exc = rb_make_exception(argc, argv); } + + /* making an exception object can switch thread, + so we need to check thread deadness again */ + if (rb_threadptr_dead(th)) { + return Qnil; + } + rb_threadptr_setup_exception(GET_THREAD(), exc, Qundef); rb_threadptr_pending_interrupt_enque(th, exc); rb_threadptr_interrupt(th); |