Merged revisions 76432,76558 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76432 | mark.dickinson | 2009-11-20 19:30:22 +0000 (Fri, 20 Nov 2009) | 5 lines Issue #7272: Add configure test to detect whether sem_open works properly, and use this to skip test_multiprocessing on platforms where sem_open raises a signal. This should fix some FreeBSD buildbot failures for test_multiprocessing. ........ r76558 | mark.dickinson | 2009-11-28 10:44:20 +0000 (Sat, 28 Nov 2009) | 4 lines Issue #7272, continued: don't re-use existing HAVE_BROKEN_POSIX_SEMAPHORES to indicate that semaphores aren't available; define a new variable POSIX_SEMAPHORES_NOT_ENABLED instead. ........
This commit is contained in:
Mark Dickinson
parent
a4962cb694
commit
a614f042a2
|
|
@ -263,7 +263,8 @@ PyInit__multiprocessing(void)
|
|||
Py_INCREF(&ConnectionType);
|
||||
PyModule_AddObject(module, "Connection", (PyObject*)&ConnectionType);
|
||||
|
||||
#if defined(MS_WINDOWS) || defined(HAVE_SEM_OPEN)
|
||||
#if defined(MS_WINDOWS) || \
|
||||
(defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED))
|
||||
/* Add SemLock type to module */
|
||||
if (PyType_Ready(&SemLockType) < 0)
|
||||
return NULL;
|
||||
|
|
@ -311,7 +312,7 @@ PyInit__multiprocessing(void)
|
|||
Py_DECREF(temp); Py_DECREF(value); return NULL; } \
|
||||
Py_DECREF(value)
|
||||
|
||||
#ifdef HAVE_SEM_OPEN
|
||||
#if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
|
||||
ADD_FLAG(HAVE_SEM_OPEN);
|
||||
#endif
|
||||
#ifdef HAVE_SEM_TIMEDWAIT
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
# include <sys/socket.h>
|
||||
# include <sys/uio.h>
|
||||
# include <arpa/inet.h> /* htonl() and ntohl() */
|
||||
# ifdef HAVE_SEM_OPEN
|
||||
# if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
|
||||
# include <semaphore.h>
|
||||
typedef sem_t *SEM_HANDLE;
|
||||
# endif
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 76405 .
|
||||
# From configure.in Revision: 76552 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for python 3.2.
|
||||
#
|
||||
|
|
@ -23587,6 +23587,90 @@ fi
|
|||
|
||||
LIBS=$LIBS_SAVE
|
||||
|
||||
# For multiprocessing module, check that sem_open
|
||||
# actually works. For FreeBSD versions <= 7.2,
|
||||
# the kernel module that provides POSIX semaphores
|
||||
# isn't loaded by default, so an attempt to call
|
||||
# sem_open results in a 'Signal 12' error.
|
||||
{ echo "$as_me:$LINENO: checking whether POSIX semaphores are enabled" >&5
|
||||
echo $ECHO_N "checking whether POSIX semaphores are enabled... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_posix_semaphores_enabled+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test "$cross_compiling" = yes; then
|
||||
ac_cv_posix_semaphores_enabled=yes
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <semaphore.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
int main(void) {
|
||||
sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
|
||||
if (a == SEM_FAILED) {
|
||||
perror("sem_open");
|
||||
return 1;
|
||||
}
|
||||
sem_close(a);
|
||||
return 0;
|
||||
}
|
||||
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||||
{ (case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_try") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_posix_semaphores_enabled=yes
|
||||
else
|
||||
echo "$as_me: program exited with status $ac_status" >&5
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
( exit $ac_status )
|
||||
ac_cv_posix_semaphores_enabled=no
|
||||
fi
|
||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_posix_semaphores_enabled" >&5
|
||||
echo "${ECHO_T}$ac_cv_posix_semaphores_enabled" >&6; }
|
||||
if test $ac_cv_posix_semaphores_enabled = no
|
||||
then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define POSIX_SEMAPHORES_NOT_ENABLED 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
# Multiprocessing check for broken sem_getvalue
|
||||
{ echo "$as_me:$LINENO: checking for broken sem_getvalue" >&5
|
||||
echo $ECHO_N "checking for broken sem_getvalue... $ECHO_C" >&6; }
|
||||
|
|
|
|||
34
configure.in
34
configure.in
|
|
@ -3290,6 +3290,40 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include <math.h>]])
|
|||
|
||||
LIBS=$LIBS_SAVE
|
||||
|
||||
# For multiprocessing module, check that sem_open
|
||||
# actually works. For FreeBSD versions <= 7.2,
|
||||
# the kernel module that provides POSIX semaphores
|
||||
# isn't loaded by default, so an attempt to call
|
||||
# sem_open results in a 'Signal 12' error.
|
||||
AC_MSG_CHECKING(whether POSIX semaphores are enabled)
|
||||
AC_CACHE_VAL(ac_cv_posix_semaphores_enabled,
|
||||
AC_TRY_RUN([
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <semaphore.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
int main(void) {
|
||||
sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
|
||||
if (a == SEM_FAILED) {
|
||||
perror("sem_open");
|
||||
return 1;
|
||||
}
|
||||
sem_close(a);
|
||||
return 0;
|
||||
}
|
||||
], ac_cv_posix_semaphores_enabled=yes,
|
||||
ac_cv_posix_semaphores_enabled=no,
|
||||
ac_cv_posix_semaphores_enabled=yes)
|
||||
)
|
||||
AC_MSG_RESULT($ac_cv_posix_semaphores_enabled)
|
||||
if test $ac_cv_posix_semaphores_enabled = no
|
||||
then
|
||||
AC_DEFINE(POSIX_SEMAPHORES_NOT_ENABLED, 1,
|
||||
[Define if POSIX semaphores aren't enabled on your system])
|
||||
fi
|
||||
|
||||
# Multiprocessing check for broken sem_getvalue
|
||||
AC_MSG_CHECKING(for broken sem_getvalue)
|
||||
AC_CACHE_VAL(ac_cv_broken_sem_getvalue,
|
||||
|
|
|
|||
|
|
@ -916,6 +916,9 @@
|
|||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
/* Define if POSIX semaphores aren't enabled on your system */
|
||||
#undef POSIX_SEMAPHORES_NOT_ENABLED
|
||||
|
||||
/* Defined if PTHREAD_SCOPE_SYSTEM supported. */
|
||||
#undef PTHREAD_SYSTEM_SCHED_SUPPORTED
|
||||
|
||||
|
|
|
|||
3
setup.py
3
setup.py
|
|
@ -1183,7 +1183,8 @@ class PyBuildExt(build_ext):
|
|||
multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
|
||||
'_multiprocessing/socket_connection.c'
|
||||
]
|
||||
if sysconfig.get_config_var('HAVE_SEM_OPEN'):
|
||||
if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
|
||||
sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
|
||||
multiprocessing_srcs.append('_multiprocessing/semaphore.c')
|
||||
|
||||
if sysconfig.get_config_var('WITH_THREAD'):
|
||||
|
|
|
|||
Loading…
Reference in New Issue