From 9dffa45b817da4354ec5506ab5a16a73e79d30f8 Mon Sep 17 00:00:00 2001 From: Vincent Loechner Date: Wed, 4 Jul 2012 16:40:57 +0200 Subject: [PATCH] thread safe polylib configuration --- Makefile.am | 2 +- configure.in | 26 ++++- include/polylib/ext_ehrhart.h | 2 + m4/acx_pthread.m4 | 243 ++++++++++++++++++++++++++++++++++++++++++ source/arith/errors.c | 3 +- source/kernel/vector.c | 4 +- 6 files changed, 275 insertions(+), 5 deletions(-) create mode 100644 m4/acx_pthread.m4 diff --git a/Makefile.am b/Makefile.am index 6d02c2a..b11a38a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ sources = $(CFILES) \ $(poly_arith)/arithmetique.h \ $(poly_arith)/arithmetic_errors.h -EXTRA_DIST = doc source/oldpolytest.c INSTALL COPYING +EXTRA_DIST = doc source/oldpolytest.c INSTALL COPYING m4/acx_pthread.m4 lib_LTLIBRARIES = @polylibs@ libpolylib32_la_LDFLAGS = -rpath $(libdir) -version-info @versioninfo@ diff --git a/configure.in b/configure.in index 82289f4..69b14d3 100644 --- a/configure.in +++ b/configure.in @@ -45,7 +45,7 @@ dnl Makefile in this directory. dnl Process this file with autoconf to produce a configure script. -AC_INIT(polylib, 5.22.5) +AC_INIT(polylib, 5.22.5b) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE([gnu]) AC_CONFIG_SRCDIR(include/polylib/polylib.h.in) @@ -69,6 +69,7 @@ if test "x$prefix" != "xNONE"; then fi dnl Checks for programs. +AC_LANG(C) AC_PROG_CC AC_PROG_LN_S AC_PROG_INSTALL @@ -258,7 +259,28 @@ AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,test,[$PATH:$doxygen_package/bin:/usr/loca dnl AC_MSG_RESULT($DOXYGEN) +dnl AC_CHECK_LIB(pthread, pthread_create) +ACX_PTHREAD() +AC_ARG_ENABLE(threadsafe, + [ --enable-threadsafe threadsafe polylib (enabled by default if a threading library is found))], + [ + if test "$enable_threadsafe" = "yes" -a "X$PTHREAD_CC" = "X"; then + AC_MSG_ERROR([pthread library not found]) + fi + ] ) + +if test "X$PTHREAD_CC" = "X" ; then + AC_MSG_WARN([No pthread library found, PolyLib will not be threadsafe]) +elif test "X$PTHREAD_CC" != "X" ; then + LIBS="$LIBS $PTHREAD_LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS -DTHREAD_SAFE_POLYLIB" + CC="$PTHREAD_CC" + AC_MSG_NOTICE([Will build a threadsafe library]) +fi + AC_SUBST(LIBS) +AC_SUBST(CFLAGS) +AC_SUBST(CC) dnl long/int bits and compilation flags AC_SUBST(BITS) @@ -287,8 +309,8 @@ AC_OUTPUT(Makefile ) -echo "Polylib will be built with " $ALL_BITS "integer size(s)" echo "---------------------------------------------------" +echo "Polylib will be built with " $ALL_BITS "integer size(s)" echo "You can proceed with:" echo "make :to build the libs and the executables" echo "make tests :to test the library" diff --git a/include/polylib/ext_ehrhart.h b/include/polylib/ext_ehrhart.h index 811e883..a17480d 100644 --- a/include/polylib/ext_ehrhart.h +++ b/include/polylib/ext_ehrhart.h @@ -23,4 +23,6 @@ extern Enumeration *Domain_Enumerate(Polyhedron *D, Polyhedron *C, extern void new_eadd (evalue *e1,evalue *res); +extern void Scalar_product(Value *p1,Value *p2,unsigned length, Value *r); + #endif diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 new file mode 100644 index 0000000..329751c --- /dev/null +++ b/m4/acx_pthread.m4 @@ -0,0 +1,243 @@ + +dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +dnl +dnl @summary figure out how to build C programs using POSIX threads +dnl +dnl This macro figures out how to build C programs using POSIX threads. +dnl It sets the PTHREAD_LIBS output variable to the threads library and +dnl linker flags, and the PTHREAD_CFLAGS output variable to any special +dnl C compiler flags that are needed. (The user can also force certain +dnl compiler flags/libs to be tested by setting these environment +dnl variables.) +dnl +dnl Also sets PTHREAD_CC to any special C compiler that is needed for +dnl multi-threaded programs (defaults to the value of CC otherwise). +dnl (This is necessary on AIX to use the special cc_r compiler alias.) +dnl +dnl NOTE: You are assumed to not only compile your program with these +dnl flags, but also link it with them as well. e.g. you should link +dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS +dnl $LIBS +dnl +dnl If you are only building threads programs, you may wish to use +dnl these variables in your default LIBS, CFLAGS, and CC: +dnl +dnl LIBS="$PTHREAD_LIBS $LIBS" +dnl CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +dnl CC="$PTHREAD_CC" +dnl +dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute +dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to +dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). +dnl +dnl ACTION-IF-FOUND is a list of shell commands to run if a threads +dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to +dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the +dnl default action will define HAVE_PTHREAD. +dnl +dnl Please let the authors know if this macro fails on any platform, or +dnl if you have any other suggestions or comments. This macro was based +dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with +dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros +dnl posted by Alejandro Forero Cuervo to the autoconf macro repository. +dnl We are also grateful for the helpful feedback of numerous users. +dnl +dnl @category InstalledPackages +dnl @author Steven G. Johnson +dnl @version 2006-05-29 +dnl @license GPLWithACException + +AC_DEFUN([ACX_PTHREAD], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_LANG_SAVE +AC_LANG_C +acx_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) + AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) + AC_MSG_RESULT($acx_pthread_ok) + if test x"$acx_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case "${host_cpu}-${host_os}" in + *solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ;; +esac + +if test x"$acx_pthread_ok" = xno; then +for flag in $acx_pthread_flags; do + + case $flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $flag]) + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) + if test x"$acx_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$flag]) + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + AC_TRY_LINK([#include ], + [pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], + [acx_pthread_ok=yes]) + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + AC_MSG_RESULT($acx_pthread_ok) + if test "x$acx_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + AC_MSG_CHECKING([for joinable pthread attribute]) + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + AC_TRY_LINK([#include ], [int attr=$attr; return attr;], + [attr_name=$attr; break]) + done + AC_MSG_RESULT($attr_name) + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, + [Define to necessary symbol if this constant + uses a non-standard name on your system.]) + fi + + AC_MSG_CHECKING([if more special flags are required for pthreads]) + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + esac + AC_MSG_RESULT(${flag}) + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) + else + PTHREAD_CC=$CC + fi +else + PTHREAD_CC="$CC" +fi + +AC_SUBST(PTHREAD_LIBS) +AC_SUBST(PTHREAD_CFLAGS) +AC_SUBST(PTHREAD_CC) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_pthread_ok" = xyes; then + ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) + : +else + acx_pthread_ok=no + $2 +fi +AC_LANG_RESTORE +])dnl ACX_PTHREAD diff --git a/source/arith/errors.c b/source/arith/errors.c index ef2dc34..df9e1db 100644 --- a/source/arith/errors.c +++ b/source/arith/errors.c @@ -100,7 +100,8 @@ #include #include -//#define THREAD_SAFE_POLYLIB +/* defined by configure script */ +/* #define THREAD_SAFE_POLYLIB */ #include "arithmetique.h" diff --git a/source/kernel/vector.c b/source/kernel/vector.c index 6ae81e0..3d208a8 100644 --- a/source/kernel/vector.c +++ b/source/kernel/vector.c @@ -29,7 +29,9 @@ #include #include -//#define THREAD_SAFE_POLYLIB + +/* defined by configure script */ +/* #define THREAD_SAFE_POLYLIB */ #ifdef MAC_OS #define abs __abs -- 2.11.4.GIT