kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

thread.c: fix deadlock

Browse source 
* thread.c (ruby_kill): get rid of deadlock on signal 0.
  [ruby-dev:47182] [Bug #8137]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-03-21 14:17:10 +00:00
parent 042594bb50
commit 5de144f3a5
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Mar 21 23:17:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (ruby_kill): get rid of deadlock on signal 0.
[ruby-dev:47182] [Bug #8137]
Thu Mar 21 23:14:15 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Mar 21 23:14:15 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (RB_UNUSED_VAR): move code from * include/ruby/ruby.h (RB_UNUSED_VAR): move code from

6
test/ruby/test_signal.rb
View file

@ -285,5 +285,11 @@ EOS
assert_raise(SignalException) { assert_raise(SignalException) {
Process.kill('HUP', Process.pid) Process.kill('HUP', Process.pid)
} }
bug8137 = '[ruby-dev:47182] [Bug #8137]'
assert_nothing_raised(bug8137) {
Timeout.timeout(1) {
Process.kill(0, Process.pid)
}
}
end end
end end

5
thread.c
View file

@ -5214,14 +5214,15 @@ ruby_kill(rb_pid_t pid, int sig)
* When target pid is self, many caller assume signal will be * When target pid is self, many caller assume signal will be
* delivered immediately and synchronously. * delivered immediately and synchronously.
*/ */
if ((th == vm->main_thread) && (pid == getpid())) { if ((sig != 0) && (th == vm->main_thread) && (pid == getpid())) {
GVL_UNLOCK_BEGIN(); GVL_UNLOCK_BEGIN();
native_mutex_lock(&th->interrupt_lock); native_mutex_lock(&th->interrupt_lock);
err = kill(pid, sig); err = kill(pid, sig);
native_cond_wait(&th->interrupt_cond, &th->interrupt_lock); native_cond_wait(&th->interrupt_cond, &th->interrupt_lock);
native_mutex_unlock(&th->interrupt_lock); native_mutex_unlock(&th->interrupt_lock);
GVL_UNLOCK_END(); GVL_UNLOCK_END();
} else { }
else {
err = kill(pid, sig); err = kill(pid, sig);
} }
if (err < 0) if (err < 0)