diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | process.c | 9 | ||||
| -rw-r--r-- | test/ruby/test_process.rb | 12 |
3 files changed, 21 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Mon Dec 29 22:37:17 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * process.c (rb_waitpid): retries waitpid when EINTR. + [ruby-core:19744]. + Mon Dec 29 23:18:52 2008 Tadayoshi Funaba <tadf@dotrb.org> * bignum.c (rb_cstr_to_inum): changed an error message. @@ -624,18 +624,17 @@ rb_waitpid(rb_pid_t pid, int *st, int flags) #ifndef NO_WAITPID struct waitpid_arg arg; +retry: arg.pid = pid; arg.st = st; arg.flags = flags; result = (rb_pid_t)rb_thread_blocking_region(rb_waitpid_blocking, &arg, RUBY_UBF_PROCESS, 0); if (result < 0) { -#if 0 if (errno == EINTR) { - rb_thread_polling(); - goto retry; - } -#endif + RUBY_VM_CHECK_INTS(); + goto retry; + } return -1; } #else /* NO_WAITPID */ diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 97b48827b..1e7b63a47 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1044,4 +1044,16 @@ class TestProcess < Test::Unit::TestCase def test_pst_inspect assert_nothing_raised { Process::Status.allocate.inspect } end + + def test_wait_and_sigchild + signal_received = [] + Signal.trap(:CHLD) { signal_received << true; puts "child died" } + pid = fork { sleep 1; exit } + Thread.start { raise } + Process.wait pid + sleep 2 + assert_equal [true], signal_received, " [ruby-core:19744]" + ensure + Signal.trap(:CHLD, 'DEFAULT') + end end |