1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

process.c (waitpid_nogvl): check interrupts before sleeping

Browse Source 
We may be interrupted by another thread after setting ubf,
but before we re-acquire interrupt_lock again to sleep on
w->cond.

This should fix test_wait_interrupt in test/ruby/test_process.rb

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-06-29 07:52:24 +00:00
parent d3ae13571f
commit 25b15f9441
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
process.c
View File

@ -1017,7 +1017,11 @@ waitpid_nogvl(void *x)
rb_thread_t *th = rb_ec_thread_ptr(w->ec);
rb_native_mutex_lock(&th->interrupt_lock);
if (!w->ret) { /* we must check this before waiting */
/*
* We must check again before waiting, timer-thread may change w->ret
* by the time we enter this. And we may also be interrupted.
*/
if (!w->ret && !RUBY_VM_INTERRUPTED_ANY(w->ec)) {
rb_native_cond_wait(w->cond, &th->interrupt_lock);
}
rb_native_mutex_unlock(&th->interrupt_lock);