X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=1f499c733e492f519dfadb4c3aa575cae6181009;hp=909cf1de52cfdcae80ca81832d07b1711a81a837;hb=HEAD;hpb=d5a39857691dfd86c2b1fb3a7ba6161b98130ab1

diff --git a/configure.ac b/configure.ac
index 909cf1d..2807932 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,10 @@ AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([The compiler does not s
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 
+# Check if the selected C compiler supports atomic builtins
+AE_CC_ATOMIC_BUILTINS
+
+
 ##                     ##
 ## C++ compiler checks ##
 ##                     ##
@@ -230,6 +234,16 @@ AE_FEATURE([rcu-debug], [Enable internal debugging self-checks. Introduces a per
 AE_FEATURE_DEFAULT_DISABLE
 AE_FEATURE([cds-lfht-iter-debug], [Enable extra debugging checks for lock-free hash table iterator traversal. Alters the rculfhash ABI. Make sure to compile both library and application with matching configuration.])
 
+# Use compiler atomic builtins, when disabled use our legacy uatomic implementation.
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([compiler-atomic-builtins], [Enable the use of compiler atomic builtins.])
+
+# emit legacy memory barriers
+# Enable by default
+AE_FEATURE_DEFAULT_ENABLE
+AE_FEATURE([legacy-mb], [Disable legacy memory barriers.])
+
 # When given, add -Werror to WARN_CFLAGS and WARN_CXXFLAGS.
 # Disabled by default
 AE_FEATURE_DEFAULT_DISABLE
@@ -259,6 +273,13 @@ AE_IF_FEATURE_ENABLED([cds-lfht-iter-debug], [
   AC_DEFINE([CONFIG_CDS_LFHT_ITER_DEBUG], [1], [Enable extra debugging checks for lock-free hash table iterator traversal. Alters the rculfhash ABI. Make sure to compile both library and application with matching configuration.])
 ])
 
+AE_IF_FEATURE_ENABLED([compiler-atomic-builtins], [
+  AC_DEFINE([CONFIG_RCU_USE_ATOMIC_BUILTINS], [1], [Use compiler atomic builtins.])
+])
+
+AE_IF_FEATURE_ENABLED([legacy-mb], [
+  AC_DEFINE([CONFIG_RCU_EMIT_LEGACY_MB], [1], [Emit legacy memory barriers that were documented in the APIs.])
+])
 
 ##                                                                          ##
 ## Set automake variables for optional feature conditionnals in Makefile.am ##
@@ -268,6 +289,17 @@ AE_IF_FEATURE_ENABLED([cds-lfht-iter-debug], [
 AM_CONDITIONAL([ENABLE_EXAMPLES], AE_IS_FEATURE_ENABLED([shared]))
 
 
+##                                          ##
+## Check for optional features dependencies ##
+##                                          ##
+
+
+AE_IF_FEATURE_ENABLED([compiler-atomic-builtins], [
+  AS_IF([test "x$ae_cv_cc_atomic_builtins" != xyes], [
+     AC_MSG_ERROR([The compiler does not support atomic builtins.])
+  ])
+])
+
 ##                                             ##
 ## Substitute variables for use in Makefile.am ##
 ##                                             ##
@@ -313,7 +345,6 @@ AC_CONFIG_FILES([
 	src/liburcu-qsbr.pc
 	src/liburcu-mb.pc
 	src/liburcu-memb.pc
-	src/liburcu-signal.pc
 ])
 
 AC_CONFIG_FILES([tests/utils/env.sh],[chmod +x tests/utils/env.sh])
@@ -325,50 +356,58 @@ AC_OUTPUT
 # Mini-report on what will be built.
 #
 
-PPRINT_INIT
-PPRINT_SET_INDENT(1)
-PPRINT_SET_TS(38)
+AE_PPRINT_INIT
+AE_PPRINT_SET_INDENT(1)
+AE_PPRINT_SET_TS(38)
 
 AS_ECHO
-AS_ECHO("${PPRINT_COLOR_BLDBLU}Userspace-RCU $PACKAGE_VERSION${PPRINT_COLOR_RST}")
+AS_ECHO("${AE_PPRINT_COLOR_BLDBLU}Userspace-RCU $PACKAGE_VERSION${AE_PPRINT_COLOR_RST}")
 AS_ECHO
 
-PPRINT_SUBTITLE([Features])
+AE_PPRINT_SUBTITLE([Features])
 
-PPRINT_PROP_STRING([Target architecture], $host_cpu)
+AE_PPRINT_PROP_STRING([Target architecture], $host_cpu)
 
 # SMP support enabled/disabled
 AE_IS_FEATURE_ENABLED([smp-support]) && value=1 || value=0
-PPRINT_PROP_BOOL([SMP support], $value)
+AE_PPRINT_PROP_BOOL([SMP support], $value)
 
 # TLS
 AE_IS_FEATURE_ENABLED([compiler-tls]) && value="compiler TLS" || value="pthread_getspecific()"
-PPRINT_PROP_STRING([Thread Local Storage (TLS)], [$value])
+AE_PPRINT_PROP_STRING([Thread Local Storage (TLS)], [$value])
 
 # clock_gettime() available
 test "x$ac_cv_search_function_clock_gettime" != "xno" && value=1 || value=0
-PPRINT_PROP_BOOL([clock_gettime()], $value)
+AE_PPRINT_PROP_BOOL([clock_gettime()], $value)
 
 # Require membarrier
 AE_IS_FEATURE_ENABLED([sys-membarrier-fallback]) && value=0 || value=1
-PPRINT_PROP_BOOL([Require membarrier], $value)
+AE_PPRINT_PROP_BOOL([Require membarrier], $value)
 
 # RCU debug enabled/disabled
 AE_IS_FEATURE_ENABLED([rcu-debug]) && value=1 || value=0
-PPRINT_PROP_BOOL([Internal debugging], $value)
+AE_PPRINT_PROP_BOOL([Internal debugging], $value)
 
 # rculfhash iterator debug enabled/disabled
 AE_IS_FEATURE_ENABLED([cds-lfht-iter-debug]) && value=1 || value=0
-PPRINT_PROP_BOOL([Lock-free HT iterator debugging], $value)
+AE_PPRINT_PROP_BOOL([Lock-free HT iterator debugging], $value)
+
+AE_PPRINT_PROP_BOOL([Multi-flavor support], 1)
+
+# atomic builtins enabled/disabled
+AE_IS_FEATURE_ENABLED([compiler-atomic-builtins]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL([Use compiler atomic builtins], $value)
 
-PPRINT_PROP_BOOL([Multi-flavor support], 1)
+# legacy memory barriers
+AE_IS_FEATURE_ENABLED([legacy-mb]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL([Emit legacy memory barriers], $value)
 
 report_bindir="`eval eval echo $bindir`"
 report_libdir="`eval eval echo $libdir`"
 
 # Print the bindir and libdir this 'make install' will install into.
 AS_ECHO
-PPRINT_SUBTITLE([Install directories])
-PPRINT_PROP_STRING([Binaries], [$report_bindir])
-PPRINT_PROP_STRING([Libraries], [$report_libdir])
+AE_PPRINT_SUBTITLE([Install directories])
+AE_PPRINT_PROP_STRING([Binaries], [$report_bindir])
+AE_PPRINT_PROP_STRING([Libraries], [$report_libdir])