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

process.c: retry loop

Browse Source 
* process.c (rb_waitpid): refactor retry loop by interrupt.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-09-08 07:00:13 +00:00
parent d5d6b149df
commit 2a87a0fc73
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
process.c
View File

@ -863,25 +863,28 @@ rb_waitpid_blocking(void *data)
return (void *)(VALUE)result; return (void *)(VALUE)result;
} }
static rb_pid_t
do_waitpid_nonblocking(rb_pid_t pid, int *st, int flags)
{
void *result;
struct waitpid_arg arg;
arg.pid = pid;
arg.st = st;
arg.flags = flags;
result = rb_thread_call_without_gvl(rb_waitpid_blocking, &arg,
RUBY_UBF_PROCESS, 0);
return (rb_pid_t)(VALUE)result;
}
rb_pid_t rb_pid_t
rb_waitpid(rb_pid_t pid, int *st, int flags) rb_waitpid(rb_pid_t pid, int *st, int flags)
{ {
rb_pid_t result; rb_pid_t result;
struct waitpid_arg arg;
retry: while ((result = do_waitpid_nonblocking(pid, st, flags)) < 0 &&
arg.pid = pid; (errno == EINTR)) {
arg.st = st; rb_thread_t *th = GET_THREAD();
arg.flags = flags; RUBY_VM_CHECK_INTS(th);
result = (rb_pid_t)(VALUE)rb_thread_call_without_gvl(rb_waitpid_blocking, &arg,
RUBY_UBF_PROCESS, 0);
if (result < 0) {
if (errno == EINTR) {
rb_thread_t *th = GET_THREAD();
RUBY_VM_CHECK_INTS(th);
goto retry;
}
return (rb_pid_t)-1;
} }
if (result > 0) { if (result > 0) {
rb_last_status_set(*st, result); rb_last_status_set(*st, result);