From d3e0f9eaee9633d8bf3f3d0b96f0d47a446e057c Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 30 Dec 2008 10:32:51 +0000 Subject: merges r21181 from trunk into ruby_1_9_1. * process.c (rb_waitpid): retries waitpid when EINTR. [ruby-core:19744]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ process.c | 9 ++++----- test/ruby/test_process.rb | 12 ++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c4724d44..6b299bd0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 29 22:37:17 2008 Yuki Sonoda (Yugui) + + * process.c (rb_waitpid): retries waitpid when EINTR. + [ruby-core:19744]. + Mon Dec 29 23:41:42 2008 Koichi Sasada * ext/dl/test/test_base.rb: add libc search logic. diff --git a/process.c b/process.c index 584f00562..11c7c2314 100644 --- a/process.c +++ b/process.c @@ -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 5a95a52f0..072e7742d 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1010,4 +1010,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 -- cgit