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

process.c: disable vfork on OS X

Browse Source 
* 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
This commit is contained in:
nobu 2014-09-07 01:57:44 +00:00
parent cd99e0f223
commit ed0a7d4627
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.in
View File

@ -963,6 +963,7 @@ AS_CASE(["$target_os"],
ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
ac_cv_lib_crypt_crypt=no ac_cv_lib_crypt_crypt=no
ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync() ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
ac_cv_func_vfork_works=no
AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt, AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
[AC_TRY_RUN([ [AC_TRY_RUN([
#include <stdio.h> #include <stdio.h>
@ -2669,10 +2670,8 @@ if test x"$ac_cv_header_ucontext_h" = xyes; then
fi fi
fi fi
if test "$rb_with_pthread" = "yes"; then if test "$ac_cv_func_fork_works" = "yes" -a "$rb_with_pthread" = "yes"; then
for f in fork vfork; do AC_CACHE_CHECK([if fork works with pthread], rb_cv_fork_with_pthread,
if eval 'test "$ac_cv_func_'$f'_works" = "yes"'; then
AC_CACHE_CHECK([if $f works with pthread], rb_cv_${f}_with_pthread,
[AC_TRY_RUN([ [AC_TRY_RUN([
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -2712,7 +2711,7 @@ main(int argc, char *argv[])
{ {
pid_t pid; pid_t pid;
if (use_threads()) return EXIT_FAILURE; if (use_threads()) return EXIT_FAILURE;
pid = $f(); pid = fork();
if (pid) { if (pid) {
int loc; int loc;
@ -2730,14 +2729,10 @@ main(int argc, char *argv[])
return EXIT_SUCCESS; return EXIT_SUCCESS;
}], }],
work=yes, rb_cv_fork_with_pthread=yes,
work=no, rb_cv_fork_with_pthread=no,
work=yes)] rb_cv_fork_with_pthread=yes)])
eval rb_cv_${f}_with_pthread=$work)
fi
done
test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD) test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD)
test x$rb_cv_vfork_with_pthread = xyes || AC_DEFINE(CANNOT_VFORK_WITH_PTHREAD)
fi fi

4
process.c
View File

@ -3281,7 +3281,7 @@ recv_child_error(int fd, int *errp, char *errmsg, size_t errmsg_buflen)
return size != 0; return size != 0;
} }
#if defined(HAVE_WORKING_VFORK) && !defined(CANNOT_VFORK_WITH_PTHREAD) #ifdef HAVE_WORKING_VFORK
#if !defined(HAVE_GETRESUID) && defined(HAVE_GETUIDX) #if !defined(HAVE_GETRESUID) && defined(HAVE_GETUIDX)
/* AIX 7.1 */ /* AIX 7.1 */
static int static int
@ -3491,7 +3491,7 @@ retry_fork_async_signal_safe(int *status, int *ep,
while (1) { while (1) {
prefork(); prefork();
disable_child_handler_before_fork(&old); disable_child_handler_before_fork(&old);
#if defined(HAVE_WORKING_VFORK) && !defined(CANNOT_VFORK_WITH_PTHREAD) #ifdef HAVE_WORKING_VFORK
if (!has_privilege()) if (!has_privilege())
pid = vfork(); pid = vfork();
else else