diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-07 01:57:44 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-07 01:57:44 +0000 |
commit | ed0a7d4627605727cb1f85dbbfc37a02f218092e (patch) | |
tree | 041621c26d22f48490d5f3528988de9daee48773 /process.c | |
parent | cd99e0f223a8b73d3913f6bd488b057451ec7d44 (diff) |
process.c: disable vfork on OS X
* process.c (retry_fork_async_signal_safe): revert r47439 but
disable use of vfork on OS X instead, as it cause hang-up at
test_process.rb:test_deadlock_by_signal_at_forking with parallel
test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r-- | process.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3281,7 +3281,7 @@ recv_child_error(int fd, int *errp, char *errmsg, size_t errmsg_buflen) return size != 0; } -#if defined(HAVE_WORKING_VFORK) && !defined(CANNOT_VFORK_WITH_PTHREAD) +#ifdef HAVE_WORKING_VFORK #if !defined(HAVE_GETRESUID) && defined(HAVE_GETUIDX) /* AIX 7.1 */ static int @@ -3491,7 +3491,7 @@ retry_fork_async_signal_safe(int *status, int *ep, while (1) { prefork(); disable_child_handler_before_fork(&old); -#if defined(HAVE_WORKING_VFORK) && !defined(CANNOT_VFORK_WITH_PTHREAD) +#ifdef HAVE_WORKING_VFORK if (!has_privilege()) pid = vfork(); else |