Port: Fixes to build system for portability
authorMichael Jeanson <mjeanson@efficios.com>
Fri, 2 Oct 2015 19:43:16 +0000 (15:43 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 6 Oct 2015 16:53:45 +0000 (12:53 -0400)
Move our own m4 scripts to m4/. Scripts in this directory are
automatically included.

Make nproc command configurable.
Make grep command configurable.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
.gitignore
Makefile.am
config/ax_tls.m4 [deleted file]
configure.ac
doc/examples/Makefile.am
m4/ax_c___attribute__.m4 [new file with mode: 0644]
m4/ax_pthread.m4 [new file with mode: 0644]
m4/ax_tls.m4 [new file with mode: 0644]
tests/regression/Makefile.am
tests/regression/regression_tests [deleted file]
tests/regression/regression_tests.in [new file with mode: 0644]

index 58e88f6..c4698b9 100644 (file)
@@ -17,6 +17,7 @@ tests/regression/rcutorture_urcu_mb
 tests/regression/rcutorture_urcu_qsbr
 tests/regression/rcutorture_urcu_signal
 tests/regression/test_urcu_fork
+tests/regression/regression_tests
 
 tests/benchmark/test_rwlock_timing
 tests/benchmark/test_urcu
@@ -136,14 +137,14 @@ Makefile
 /config/config.sub
 /config/depcomp
 /config/install-sh
-/config/libtool.m4
 /config/ltmain.sh
-/config/lt~obsolete.m4
-/config/ltoptions.m4
-/config/ltsugar.m4
-/config/ltversion.m4
 /config/missing
 /aclocal.m4
+/m4/libtool.m4
+/m4/lt~obsolete.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
 /libtool
 /stamp-h1
 /config.h.in
index 19a44ea..f41e335 100644 (file)
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS=-I config
+ACLOCAL_AMFLAGS=-I m4
 
 AM_CPPFLAGS = -I$(top_builddir)/urcu
 
diff --git a/config/ax_tls.m4 b/config/ax_tls.m4
deleted file mode 100644 (file)
index 7c86daf..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-# ===========================================================================
-#          http://www.gnu.org/software/autoconf-archive/ax_tls.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_TLS([action-if-found], [action-if-not-found])
-#
-# DESCRIPTION
-#
-#   Provides a test for the compiler support of thread local storage (TLS)
-#   extensions. Defines TLS if it is found. Currently knows about GCC/ICC
-#   and MSVC. I think SunPro uses the same as GCC, and Borland apparently
-#   supports either.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Alan Woodland <ajw05@aber.ac.uk>
-#   Copyright (c) 2010 Diego Elio Petteno` <flameeyes@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 11
-
-#   Define m4_ifblank and m4_ifnblank macros from introduced in
-#   autotools 2.64 m4sugar.m4 if using an earlier autotools.
-
-ifdef([m4_ifblank], [], [
-m4_define([m4_ifblank],
-[m4_if(m4_translit([[$1]],  [ ][       ][
-]), [], [$2], [$3])])
-])
-
-
-ifdef([m4_ifnblank], [], [
-m4_define([m4_ifnblank],
-[m4_if(m4_translit([[$1]],  [ ][       ][
-]), [], [$3], [$2])])
-])
-
-AC_DEFUN([AX_TLS], [
-  AC_MSG_CHECKING(for thread local storage (TLS) class)
-  AC_CACHE_VAL(ac_cv_tls, [
-    ax_tls_keywords="__thread __declspec(thread) none"
-    for ax_tls_keyword in $ax_tls_keywords; do
-       AS_CASE([$ax_tls_keyword],
-          [none], [ac_cv_tls=none ; break],
-          [AC_TRY_LINK(
-               [$ax_tls_keyword int foo;],
-               [++foo;],
-               [ac_cv_tls=$ax_tls_keyword ; break],
-               [ac_cv_tls=none]
-           )])
-    done
-  ])
-  AC_MSG_RESULT($ac_cv_tls)
-
-  AS_IF([test "$ac_cv_tls" != "none"],
-    AC_DEFINE_UNQUOTED([TLS], $ac_cv_tls, [If the compiler supports a TLS storage class define it to that here])
-      m4_ifnblank([$1], [$1]),
-    m4_ifnblank([$2], [$2])
-  )
-])
index 4316b90..93631d0 100644 (file)
@@ -1,26 +1,23 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-
-AC_INIT([userspace-rcu],[0.8.0],[mathieu dot desnoyers at efficios dot com])
+AC_PREREQ(2.59)
+AC_INIT([userspace-rcu],[0.8.0],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([URCU_LIBRARY_VERSION], [3:0:0])
 
+AC_CONFIG_SRCDIR([urcu.h])
+AC_CONFIG_HEADERS([config.h urcu/config.h])
 AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_MACRO_DIR([config])
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
+
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AM_MAINTAINER_MODE([enable])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-m4_include([config/ax_tls.m4])
-
-AC_CONFIG_SRCDIR([urcu.h])
 
-AC_CONFIG_HEADERS([config.h urcu/config.h])
+# Enable silent rules if available (Introduced in AM 1.11)
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AH_TEMPLATE([CONFIG_RCU_SMP], [Enable SMP support. With SMP support enabled, uniprocessors are also supported. With SMP support disabled, UP systems work fine, but the behavior of SMP systems is undefined.])
 AH_TEMPLATE([CONFIG_RCU_HAVE_FENCE], [Defined when on a system that has memory fence instructions.])
@@ -44,9 +41,14 @@ AS_IF([test "x$def_tls_detect" = "x"],
        [:],
        [AC_DEFINE_UNQUOTED([CONFIG_RCU_TLS], $def_tls_detect)])
 
-# Checks for programs.
+# Checks for C compiler
+AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
+AC_PROG_CC_STDC
+
+# Checks for programs.
 AC_PROG_MAKE_SET
+AC_CHECK_PROGS(NPROC, [nproc gnproc])
 LT_INIT
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -58,6 +60,16 @@ AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 
+AX_C___ATTRIBUTE__
+AS_IF([test "x$ax_cv___attribute__" = "xyes"],
+       [:],
+       [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
+
+AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
+LIBS="$PTHREAD_LIBS $LIBS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+CC="$PTHREAD_CC"
+
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_MMAP
@@ -327,6 +339,7 @@ AC_CONFIG_FILES([
        tests/unit/Makefile
        tests/benchmark/Makefile
        tests/regression/Makefile
+       tests/regression/regression_tests
        tests/utils/Makefile
        liburcu.pc
        liburcu-bp.pc
index 3ae6842..313f521 100644 (file)
@@ -128,14 +128,14 @@ all-local:
                        cp -pfR $(srcdir)/$$subdir $(builddir); \
                done; \
        fi; \
-       if [ x"$(shell echo "$(top_srcdir)" | grep "^/" | wc -l)" = x"1" ]; then \
+       if [ x"$(shell echo "$(top_srcdir)" | $(GREP) "^/" | wc -l)" = x"1" ]; then \
                echo "Examples: absolute top_srcdir path $(top_srcdir)"; \
                rel_src_subdir=""; \
        else \
                echo "Examples: relative top_srcdir path $(top_srcdir)"; \
                rel_src_subdir="../"; \
        fi; \
-       if [ x"$(shell echo "$(top_builddir)" | grep "^/" | wc -l)" = x"1" ]; then \
+       if [ x"$(shell echo "$(top_builddir)" | $(GREP) "^/" | wc -l)" = x"1" ]; then \
                echo "Examples: absolute top_builddir path $(top_builddir)"; \
                rel_build_subdir=""; \
        else \
diff --git a/m4/ax_c___attribute__.m4 b/m4/ax_c___attribute__.m4
new file mode 100644 (file)
index 0000000..cf3d62b
--- /dev/null
@@ -0,0 +1,66 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_c___attribute__.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_C___ATTRIBUTE__
+#
+# DESCRIPTION
+#
+#   Provides a test for the compiler support of __attribute__ extensions.
+#   Defines HAVE___ATTRIBUTE__ if it is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Stepan Kasal <skasal@redhat.com>
+#   Copyright (c) 2008 Christian Haggstrom
+#   Copyright (c) 2008 Ryan McCabe <ryan@numb.org>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 8
+
+AC_DEFUN([AX_C___ATTRIBUTE__], [
+  AC_CACHE_CHECK([for __attribute__], [ax_cv___attribute__],
+    [AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM(
+       [[#include <stdlib.h>
+         static void foo(void) __attribute__ ((unused));
+         static void
+         foo(void) {
+             exit(1);
+         }
+        ]], [])],
+      [ax_cv___attribute__=yes],
+      [ax_cv___attribute__=no]
+    )
+  ])
+  if test "$ax_cv___attribute__" = "yes"; then
+    AC_DEFINE([HAVE___ATTRIBUTE__], 1, [define if your compiler has __attribute__])
+  fi
+])
diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
new file mode 100644 (file)
index 0000000..d383ad5
--- /dev/null
@@ -0,0 +1,332 @@
+# ===========================================================================
+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also link it with them as well. e.g. you should link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threads programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 21
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PUSH([C])
+ax_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], [ax_pthread_ok=yes])
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test x"$ax_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.
+
+ax_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_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:
+
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
+        ;;
+esac
+
+# Clang doesn't consider unrecognized options an error unless we specify
+# -Werror. We throw in some extra Clang-specific options to ensure that
+# this doesn't happen for GCC, which also accepts -Werror.
+
+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
+save_CFLAGS="$CFLAGS"
+ax_pthread_extra_flags="-Werror"
+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
+                  [AC_MSG_RESULT([yes])],
+                  [ax_pthread_extra_flags=
+                   AC_MSG_RESULT([no])])
+CFLAGS="$save_CFLAGS"
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_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([ax_pthread_config], [pthread-config], [yes], [no])
+                if test x"$ax_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 $ax_pthread_extra_flags"
+
+        # 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_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+                [ax_pthread_ok=yes],
+                [])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_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_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                           [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_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                # TODO: What about Clang on Solaris?
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        AC_MSG_RESULT([$flag])
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            [ax_cv_PTHREAD_PRIO_INHERIT], [
+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != xyes; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                  [#handle absolute path differently from PATH based program lookup
+                   AS_CASE(["x$CC"],
+                     [x/*],
+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST([PTHREAD_LIBS])
+AC_SUBST([PTHREAD_CFLAGS])
+AC_SUBST([PTHREAD_CC])
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_pthread_ok" = xyes; then
+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD
diff --git a/m4/ax_tls.m4 b/m4/ax_tls.m4
new file mode 100644 (file)
index 0000000..7c86daf
--- /dev/null
@@ -0,0 +1,87 @@
+# ===========================================================================
+#          http://www.gnu.org/software/autoconf-archive/ax_tls.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_TLS([action-if-found], [action-if-not-found])
+#
+# DESCRIPTION
+#
+#   Provides a test for the compiler support of thread local storage (TLS)
+#   extensions. Defines TLS if it is found. Currently knows about GCC/ICC
+#   and MSVC. I think SunPro uses the same as GCC, and Borland apparently
+#   supports either.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Alan Woodland <ajw05@aber.ac.uk>
+#   Copyright (c) 2010 Diego Elio Petteno` <flameeyes@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 11
+
+#   Define m4_ifblank and m4_ifnblank macros from introduced in
+#   autotools 2.64 m4sugar.m4 if using an earlier autotools.
+
+ifdef([m4_ifblank], [], [
+m4_define([m4_ifblank],
+[m4_if(m4_translit([[$1]],  [ ][       ][
+]), [], [$2], [$3])])
+])
+
+
+ifdef([m4_ifnblank], [], [
+m4_define([m4_ifnblank],
+[m4_if(m4_translit([[$1]],  [ ][       ][
+]), [], [$3], [$2])])
+])
+
+AC_DEFUN([AX_TLS], [
+  AC_MSG_CHECKING(for thread local storage (TLS) class)
+  AC_CACHE_VAL(ac_cv_tls, [
+    ax_tls_keywords="__thread __declspec(thread) none"
+    for ax_tls_keyword in $ax_tls_keywords; do
+       AS_CASE([$ax_tls_keyword],
+          [none], [ac_cv_tls=none ; break],
+          [AC_TRY_LINK(
+               [$ax_tls_keyword int foo;],
+               [++foo;],
+               [ac_cv_tls=$ax_tls_keyword ; break],
+               [ac_cv_tls=none]
+           )])
+    done
+  ])
+  AC_MSG_RESULT($ac_cv_tls)
+
+  AS_IF([test "$ac_cv_tls" != "none"],
+    AC_DEFINE_UNQUOTED([TLS], $ac_cv_tls, [If the compiler supports a TLS storage class define it to that here])
+      m4_ifnblank([$1], [$1]),
+    m4_ifnblank([$2], [$2])
+  )
+])
index 05c0375..655fea8 100644 (file)
@@ -3,6 +3,12 @@ AM_LDFLAGS=-lpthread
 endif
 AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
 
+SCRIPT_LIST = run.sh
+
+dist_noinst_SCRIPTS = $(SCRIPT_LIST)
+
+noinst_DATA = regression_tests.in
+
 noinst_PROGRAMS = test_urcu_fork \
        rcutorture_urcu \
        rcutorture_urcu_signal \
diff --git a/tests/regression/regression_tests b/tests/regression/regression_tests
deleted file mode 100644 (file)
index bbf9297..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-./test_urcu_fork
-./rcutorture_urcu $(nproc) perf 1 callrcu_global
-./rcutorture_urcu_signal $(nproc) perf 1 callrcu_global
-./rcutorture_urcu_mb $(nproc) perf 1 callrcu_global
-./rcutorture_urcu_bp $(nproc) perf 1 callrcu_global
-./rcutorture_urcu_qsbr $(nproc) perf 1 callrcu_global
-./rcutorture_urcu $(nproc) rperf 1 callrcu_global
-./rcutorture_urcu_signal $(nproc) rperf 1 callrcu_global
-./rcutorture_urcu_mb $(nproc) rperf 1 callrcu_global
-./rcutorture_urcu_bp $(nproc) rperf 1 callrcu_global
-./rcutorture_urcu_qsbr $(nproc) rperf 1 callrcu_global
-./rcutorture_urcu $(nproc) uperf 1 callrcu_global
-./rcutorture_urcu_signal $(nproc) uperf 1 callrcu_global
-./rcutorture_urcu_mb $(nproc) uperf 1 callrcu_global
-./rcutorture_urcu_bp $(nproc) uperf 1 callrcu_global
-./rcutorture_urcu_qsbr $(nproc) uperf 1 callrcu_global
-./rcutorture_urcu $(nproc) stress 1 callrcu_global
-./rcutorture_urcu_signal $(nproc) stress 1 callrcu_global
-./rcutorture_urcu_mb $(nproc) stress 1 callrcu_global
-./rcutorture_urcu_bp $(nproc) stress 1 callrcu_global
-./rcutorture_urcu_qsbr $(nproc) stress 1 callrcu_global
-./rcutorture_urcu $(nproc) perf 1 callrcu_percpu
-./rcutorture_urcu_signal $(nproc) perf 1 callrcu_percpu
-./rcutorture_urcu_mb $(nproc) perf 1 callrcu_percpu
-./rcutorture_urcu_bp $(nproc) perf 1 callrcu_percpu
-./rcutorture_urcu_qsbr $(nproc) perf 1 callrcu_percpu
-./rcutorture_urcu $(nproc) rperf 1 callrcu_percpu
-./rcutorture_urcu_signal $(nproc) rperf 1 callrcu_percpu
-./rcutorture_urcu_mb $(nproc) rperf 1 callrcu_percpu
-./rcutorture_urcu_bp $(nproc) rperf 1 callrcu_percpu
-./rcutorture_urcu_qsbr $(nproc) rperf 1 callrcu_percpu
-./rcutorture_urcu $(nproc) uperf 1 callrcu_percpu
-./rcutorture_urcu_signal $(nproc) uperf 1 callrcu_percpu
-./rcutorture_urcu_mb $(nproc) uperf 1 callrcu_percpu
-./rcutorture_urcu_bp $(nproc) uperf 1 callrcu_percpu
-./rcutorture_urcu_qsbr $(nproc) uperf 1 callrcu_percpu
-./rcutorture_urcu $(nproc) stress 1 callrcu_percpu
-./rcutorture_urcu_signal $(nproc) stress 1 callrcu_percpu
-./rcutorture_urcu_mb $(nproc) stress 1 callrcu_percpu
-./rcutorture_urcu_bp $(nproc) stress 1 callrcu_percpu
-./rcutorture_urcu_qsbr $(nproc) stress 1 callrcu_percpu
-./rcutorture_urcu $(nproc) perf 1 callrcu_perthread
-./rcutorture_urcu_signal $(nproc) perf 1 callrcu_perthread
-./rcutorture_urcu_mb $(nproc) perf 1 callrcu_perthread
-./rcutorture_urcu_bp $(nproc) perf 1 callrcu_perthread
-./rcutorture_urcu_qsbr $(nproc) perf 1 callrcu_perthread
-./rcutorture_urcu $(nproc) rperf 1 callrcu_perthread
-./rcutorture_urcu_signal $(nproc) rperf 1 callrcu_perthread
-./rcutorture_urcu_mb $(nproc) rperf 1 callrcu_perthread
-./rcutorture_urcu_bp $(nproc) rperf 1 callrcu_perthread
-./rcutorture_urcu_qsbr $(nproc) rperf 1 callrcu_perthread
-./rcutorture_urcu $(nproc) uperf 1 callrcu_perthread
-./rcutorture_urcu_signal $(nproc) uperf 1 callrcu_perthread
-./rcutorture_urcu_mb $(nproc) uperf 1 callrcu_perthread
-./rcutorture_urcu_bp $(nproc) uperf 1 callrcu_perthread
-./rcutorture_urcu_qsbr $(nproc) uperf 1 callrcu_perthread
-./rcutorture_urcu $(nproc) stress 1 callrcu_perthread
-./rcutorture_urcu_signal $(nproc) stress 1 callrcu_perthread
-./rcutorture_urcu_mb $(nproc) stress 1 callrcu_perthread
-./rcutorture_urcu_bp $(nproc) stress 1 callrcu_perthread
-./rcutorture_urcu_qsbr $(nproc) stress 1 callrcu_perthread
diff --git a/tests/regression/regression_tests.in b/tests/regression/regression_tests.in
new file mode 100644 (file)
index 0000000..a66da24
--- /dev/null
@@ -0,0 +1,61 @@
+./test_urcu_fork
+./rcutorture_urcu `@NPROC@` perf 1 callrcu_global
+./rcutorture_urcu_signal `@NPROC@` perf 1 callrcu_global
+./rcutorture_urcu_mb `@NPROC@` perf 1 callrcu_global
+./rcutorture_urcu_bp `@NPROC@` perf 1 callrcu_global
+./rcutorture_urcu_qsbr `@NPROC@` perf 1 callrcu_global
+./rcutorture_urcu `@NPROC@` rperf 1 callrcu_global
+./rcutorture_urcu_signal `@NPROC@` rperf 1 callrcu_global
+./rcutorture_urcu_mb `@NPROC@` rperf 1 callrcu_global
+./rcutorture_urcu_bp `@NPROC@` rperf 1 callrcu_global
+./rcutorture_urcu_qsbr `@NPROC@` rperf 1 callrcu_global
+./rcutorture_urcu `@NPROC@` uperf 1 callrcu_global
+./rcutorture_urcu_signal `@NPROC@` uperf 1 callrcu_global
+./rcutorture_urcu_mb `@NPROC@` uperf 1 callrcu_global
+./rcutorture_urcu_bp `@NPROC@` uperf 1 callrcu_global
+./rcutorture_urcu_qsbr `@NPROC@` uperf 1 callrcu_global
+./rcutorture_urcu `@NPROC@` stress 1 callrcu_global
+./rcutorture_urcu_signal `@NPROC@` stress 1 callrcu_global
+./rcutorture_urcu_mb `@NPROC@` stress 1 callrcu_global
+./rcutorture_urcu_bp `@NPROC@` stress 1 callrcu_global
+./rcutorture_urcu_qsbr `@NPROC@` stress 1 callrcu_global
+./rcutorture_urcu `@NPROC@` perf 1 callrcu_percpu
+./rcutorture_urcu_signal `@NPROC@` perf 1 callrcu_percpu
+./rcutorture_urcu_mb `@NPROC@` perf 1 callrcu_percpu
+./rcutorture_urcu_bp `@NPROC@` perf 1 callrcu_percpu
+./rcutorture_urcu_qsbr `@NPROC@` perf 1 callrcu_percpu
+./rcutorture_urcu `@NPROC@` rperf 1 callrcu_percpu
+./rcutorture_urcu_signal `@NPROC@` rperf 1 callrcu_percpu
+./rcutorture_urcu_mb `@NPROC@` rperf 1 callrcu_percpu
+./rcutorture_urcu_bp `@NPROC@` rperf 1 callrcu_percpu
+./rcutorture_urcu_qsbr `@NPROC@` rperf 1 callrcu_percpu
+./rcutorture_urcu `@NPROC@` uperf 1 callrcu_percpu
+./rcutorture_urcu_signal `@NPROC@` uperf 1 callrcu_percpu
+./rcutorture_urcu_mb `@NPROC@` uperf 1 callrcu_percpu
+./rcutorture_urcu_bp `@NPROC@` uperf 1 callrcu_percpu
+./rcutorture_urcu_qsbr `@NPROC@` uperf 1 callrcu_percpu
+./rcutorture_urcu `@NPROC@` stress 1 callrcu_percpu
+./rcutorture_urcu_signal `@NPROC@` stress 1 callrcu_percpu
+./rcutorture_urcu_mb `@NPROC@` stress 1 callrcu_percpu
+./rcutorture_urcu_bp `@NPROC@` stress 1 callrcu_percpu
+./rcutorture_urcu_qsbr `@NPROC@` stress 1 callrcu_percpu
+./rcutorture_urcu `@NPROC@` perf 1 callrcu_perthread
+./rcutorture_urcu_signal `@NPROC@` perf 1 callrcu_perthread
+./rcutorture_urcu_mb `@NPROC@` perf 1 callrcu_perthread
+./rcutorture_urcu_bp `@NPROC@` perf 1 callrcu_perthread
+./rcutorture_urcu_qsbr `@NPROC@` perf 1 callrcu_perthread
+./rcutorture_urcu `@NPROC@` rperf 1 callrcu_perthread
+./rcutorture_urcu_signal `@NPROC@` rperf 1 callrcu_perthread
+./rcutorture_urcu_mb `@NPROC@` rperf 1 callrcu_perthread
+./rcutorture_urcu_bp `@NPROC@` rperf 1 callrcu_perthread
+./rcutorture_urcu_qsbr `@NPROC@` rperf 1 callrcu_perthread
+./rcutorture_urcu `@NPROC@` uperf 1 callrcu_perthread
+./rcutorture_urcu_signal `@NPROC@` uperf 1 callrcu_perthread
+./rcutorture_urcu_mb `@NPROC@` uperf 1 callrcu_perthread
+./rcutorture_urcu_bp `@NPROC@` uperf 1 callrcu_perthread
+./rcutorture_urcu_qsbr `@NPROC@` uperf 1 callrcu_perthread
+./rcutorture_urcu `@NPROC@` stress 1 callrcu_perthread
+./rcutorture_urcu_signal `@NPROC@` stress 1 callrcu_perthread
+./rcutorture_urcu_mb `@NPROC@` stress 1 callrcu_perthread
+./rcutorture_urcu_bp `@NPROC@` stress 1 callrcu_perthread
+./rcutorture_urcu_qsbr `@NPROC@` stress 1 callrcu_perthread
This page took 0.049409 seconds and 4 git commands to generate.