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

process.c: fix potential missed wakeups in r64576

Browse Source 
Oddly, all existing test cases passed multiple times
before this patch (even with --jit-wait), so this seems
like a difficult failure to prove.

Fixes: r64576 ("process.c: simplify SIGCHLD-based waitpid")

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-08-27 18:37:04 +00:00
parent 9d4027b503
commit e61e6ae587
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
process.c
View File

@ -936,21 +936,19 @@ void rb_sigwait_fd_put(const rb_thread_t *, int fd);
void rb_thread_sleep_interruptible(void); void rb_thread_sleep_interruptible(void);
static int static int
sigwait_fd_migrate_signaled_p(struct waitpid_state *w) waitpid_signal(struct waitpid_state *w)
{ {
int signaled = FALSE; if (w->ec) { /* rb_waitpid */
rb_thread_t *th = w->ec ? rb_ec_thread_ptr(w->ec) : 0; rb_threadptr_interrupt(rb_ec_thread_ptr(w->ec));
return TRUE;
if (th) rb_native_mutex_lock(&th->interrupt_lock);
if (w->cond) {
rb_native_cond_signal(w->cond);
signaled = TRUE;
} }
else { /* ruby_waitpid_locked */
if (th) rb_native_mutex_unlock(&th->interrupt_lock); if (w->cond) {
rb_native_cond_signal(w->cond);
return signaled; return TRUE;
}
}
return FALSE;
} }
/* /*
@ -964,10 +962,10 @@ sigwait_fd_migrate_sleeper(rb_vm_t *vm)
struct waitpid_state *w = 0; struct waitpid_state *w = 0;
list_for_each(&vm->waiting_pids, w, wnode) { list_for_each(&vm->waiting_pids, w, wnode) {
if (sigwait_fd_migrate_signaled_p(w)) return; if (waitpid_signal(w)) return;
} }
list_for_each(&vm->waiting_grps, w, wnode) { list_for_each(&vm->waiting_grps, w, wnode) {
if (sigwait_fd_migrate_signaled_p(w)) return; if (waitpid_signal(w)) return;
} }
} }
@ -995,14 +993,7 @@ waitpid_each(struct list_head *head)
w->ret = ret; w->ret = ret;
list_del_init(&w->wnode); list_del_init(&w->wnode);
if (w->ec) { /* rb_waitpid */ waitpid_signal(w);
rb_threadptr_interrupt(rb_ec_thread_ptr(w->ec));
}
else { /* ruby_waitpid_locked */
if (w->cond) {
rb_native_cond_signal(w->cond);
}
}
} }
} }
#else #else