archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 57595: [Backport #8996]

Browse source 
check thread deadness correctly.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-03-25 17:27:37 +00:00
parent da0e21528b
commit f60e5af02d
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/ruby/test_thread.rb
View file

@ -1048,4 +1048,14 @@ q.pop
assert_not_predicate(status, :signaled?, FailDesc[status, bug9751, output]) assert_not_predicate(status, :signaled?, FailDesc[status, bug9751, output])
assert_predicate(status, :success?, bug9751) assert_predicate(status, :success?, bug9751)
end if Process.respond_to?(:fork) end if Process.respond_to?(:fork)
def test_thread_interrupt_for_killed_thread
assert_normal_exit(<<-_end, '[Bug #8996]', timeout: 5)
trap(/mswin|mignw/ =~ RUBY_PLATFORM ? :KILL : :TERM){exit}
while true
t = Thread.new{sleep 0}
t.raise Interrupt
end
_end
end
end end

7
thread.c
View file

@ -2063,6 +2063,13 @@ rb_threadptr_raise(rb_thread_t *th, int argc, VALUE *argv)
else { else {
exc = rb_make_exception(argc, argv); 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_setup_exception(GET_THREAD(), exc, Qundef);
rb_threadptr_pending_interrupt_enque(th, exc); rb_threadptr_pending_interrupt_enque(th, exc);
rb_threadptr_interrupt(th); rb_threadptr_interrupt(th);

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7" #define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26" #define RUBY_RELEASE_DATE "2017-03-26"
#define RUBY_PATCHLEVEL 440 #define RUBY_PATCHLEVEL 441
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3