X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=10087f3fbd0386ab1b4ceabbb9fac5560e201209;hb=c95c332aeedc4c5af4aa4988f3379b500a852fab;hp=2440cab61e850d659959942104790104f69a6761;hpb=94480b71fd854ac90226f60688352e26843c98b6;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 2440cab6..10087f3f 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0]) # This is the library version of liblttng-ust-ctl, used internally by # liblttng-ust, lttng-sessiond, and lttng-consumerd. -AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [3:0:1]) +AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [4:0:0]) AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h]) AC_CONFIG_AUX_DIR([config]) @@ -171,6 +171,30 @@ AC_CHECK_HEADERS([ \ wchar.h \ ]) +# Set architecture specific options +AS_CASE([$host_cpu], + [i[[3456]]86], [], + [x86_64], [], + [amd64], [], + [powerpc], [], + [ppc64], [], + [ppc64le], [], + [powerpc64], [], + [powerpc64le], [], + [s390], [NO_UNALIGNED_ACCESS=1], + [s390x], [NO_UNALIGNED_ACCESS=1], + [arm*], [ + NO_UNALIGNED_ACCESS=1 + NO_NUMA=1 + ], + [aarch64*], [NO_UNALIGNED_ACCESS=1], + [mips*], [NO_UNALIGNED_ACCESS=1], + [tile*], [NO_UNALIGNED_ACCESS=1], + [ + UNSUPPORTED_ARCH=1 + NO_UNALIGNED_ACCESS=1 + ]) + # Configuration options, which will be installed in the config.h AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.]) AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h]) @@ -225,32 +249,49 @@ AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xye AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CPPFLAGS]=-Idir to specify their location. This error can also occur when the liburcu package's configure script has not been run.])]) +# URCU library version needed or newer +m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.11.0 is needed]) + +#Macro added in urcu 0.6.6 +AC_CHECK_DECL([caa_likely], [], + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) +#Macro added in urcu 0.11.0 +AC_CHECK_DECL([DEFINE_URCU_TLS_IE], [], + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]] +) + # urcu-cds - check that URCU Concurrent Data Structure lib is available to compilation # Part of Userspace RCU library 0.7.2 or better. AC_CHECK_LIB([urcu-cds], [_cds_lfht_new], [], [AC_MSG_ERROR([Cannot find liburcu-cds lib, part of Userspace RCU 0.7 or better. Use [LDFLAGS]=-Ldir to specify its location.])]) -AC_MSG_CHECKING([caa_likely()]) -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - void fct(void) - { - if (caa_likely(1)) { - } - } -]])], [ - AC_MSG_RESULT([yes]) -], [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better]) -]) - # urcu - check that URCU lib is available to compilation AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])]) # urcu - check that URCU lib is at least version 0.6 AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])]) +# numa.h integration +AS_IF([test "x$NO_NUMA" = "x1"],[ + AS_IF([test "x$enable_numa" = "x" ], [enable_numa=no]) +]) + +AC_ARG_ENABLE([numa], [ +AS_HELP_STRING([--disable-numa], [disable NUMA support]) +], [ + enable_numa=$enableval +], [ + enable_numa=yes +]) + +AS_IF([test "x$enable_numa" = "xyes"], [ + # numa - check that numa lib is available + AC_CHECK_LIB([numa], [numa_available], [], +[AC_MSG_ERROR([libnuma is not available. Please either install it (e.g. libnuma-dev) or use [LDFLAGS]=-Ldir to specify the right location, or use --disable-numa configure argument to disable NUMA support.])]) + have_libnuma=yes +]) +AM_CONDITIONAL([HAVE_LIBNUMA], [test "x$have_libnuma" = "xyes"]) + # optional linux/perf_event.h AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], []) @@ -262,28 +303,6 @@ AS_IF([test "x$have_perf_event" = "xyes"], [ AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1]) ]) -AC_MSG_CHECKING([host system alignment requirements]) -AS_CASE([$host_cpu], - [i[[3456]]86], [], - [x86_64], [], - [amd64], [], - [powerpc], [], - [ppc64], [], - [ppc64le], [], - [powerpc64], [], - [powerpc64le], [], - [s390], [NO_UNALIGNED_ACCESS=1], - [s390x], [NO_UNALIGNED_ACCESS=1], - [arm*], [NO_UNALIGNED_ACCESS=1], - [aarch64*], [NO_UNALIGNED_ACCESS=1], - [mips*], [NO_UNALIGNED_ACCESS=1], - [tile*], [NO_UNALIGNED_ACCESS=1], - [ - UNSUPPORTED_ARCH=1 - NO_UNALIGNED_ACCESS=1 - ]) -AC_MSG_RESULT([$host_cpu]) - AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [ AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) ]) @@ -463,8 +482,6 @@ AC_DEFUN([_AC_DEFINE_AND_SUBST], [ ]) _AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000]) -# By default, do not retry on buffer full condition. -_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_BLOCKING_RETRY_TIMEOUT_MS], [0]) AM_CFLAGS="-Wall" AC_SUBST(AM_CFLAGS) @@ -573,6 +590,9 @@ PPRINT_PROP_BOOL_CUSTOM([JNI interface (JNI)], $value, [use --enable-jni-interfa test "x$python_agent" = xyes && value=1 || value=0 PPRINT_PROP_BOOL_CUSTOM([Python agent], $value, [use --enable-python-agent]) +test "x$enable_numa" = xyes && value=1 || value=0 +PPRINT_PROP_BOOL([NUMA], $value) + AS_ECHO PPRINT_SET_INDENT(0)