From 4c25e2fb8ba17a4d83f3e55c6ddfa5ae417d1f7c Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 19 Jun 2013 17:44:47 +0000 Subject: [PATCH] win32.c: wait until exit * win32/win32.c (waitpid): should not return 0 but wait until exit unless WNOHANG is given. waiting huge process may return while active, for some reason. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ win32/win32.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 566a209bda..2227df2a95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 20 02:44:45 2013 Nobuyoshi Nakada + + * win32/win32.c (waitpid): should not return 0 but wait until exit + unless WNOHANG is given. waiting huge process may return while + active, for some reason. + Thu Jun 20 01:34:15 2013 Tanaka Akira * bignum.c (bdigit_roomof): Use SIZEOF_BDIGITS. diff --git a/win32/win32.c b/win32/win32.c index 7b42df096f..0fc4186fff 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4153,8 +4153,10 @@ waitpid(rb_pid_t pid, int *stat_loc, int options) /* wait... */ if (rb_w32_wait_events_blocking(&child->hProcess, 1, timeout) != WAIT_OBJECT_0) { /* still active */ - pid = 0; - break; + if (options & WNOHANG) { + pid = 0; + break; + } } } }