From 156b0cf7b48f8f2e0e99b148803354ba8b1e5c6a Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 18 Mar 2021 14:00:34 -0400 Subject: [PATCH] Set the default ust constructor timeout in the headers This is not user-configurable, use the same strategy as all other internal defaults. Change-Id: I05d61999afee44687336bf70712ee99e2da19f71 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- configure.ac | 9 --------- doc/man/Makefile.am | 1 - doc/man/lttng-ust.3.txt | 2 +- include/ust-comm.h | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index bc119c38..4d82488d 100644 --- a/configure.ac +++ b/configure.ac @@ -475,15 +475,6 @@ they will not be installed. AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"]) AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"]) -# Default values -AC_DEFUN([_AC_DEFINE_AND_SUBST], [ - AC_DEFINE_UNQUOTED([CONFIG_$1], [$2], [$1]) - $1="$2" - AC_SUBST([$1]) -]) - -_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000]) - AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS" AC_SUBST(AM_CFLAGS) diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 9cee98d1..d84bfcdc 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -63,7 +63,6 @@ xmlto_verbose_0 = @echo " XMLTO " $@; # Tools to execute: ADOC = $(asciidoc_verbose)$(ASCIIDOC) -f $(ASCIIDOC_CONF) -d manpage \ - -a lttng_ust_register_timeout="@LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS@" \ -a mansource="LTTng" \ -a manmanual="LTTng Manual" \ -a manversion="$(PACKAGE_VERSION)" diff --git a/doc/man/lttng-ust.3.txt b/doc/man/lttng-ust.3.txt index e6887f8d..ab3c4775 100644 --- a/doc/man/lttng-ust.3.txt +++ b/doc/man/lttng-ust.3.txt @@ -1417,7 +1417,7 @@ The value `0` means _do not wait_. The value `-1` means _wait forever_. Setting this environment variable to `0` is recommended for applications with time constraints on the process startup time. + -Default: {lttng_ust_register_timeout}. +Default: 3000. `LTTNG_UST_WITHOUT_BADDR_STATEDUMP`:: If set, prevents `liblttng-ust` from performing a base address state diff --git a/include/ust-comm.h b/include/ust-comm.h index da3e2a18..88748ce5 100644 --- a/include/ust-comm.h +++ b/include/ust-comm.h @@ -28,7 +28,7 @@ * variable "LTTNG_UST_REGISTER_TIMEOUT". Note that if the sessiond is not * found, the application proceeds directly without any delay. */ -#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS CONFIG_LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS +#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS 3000 #define LTTNG_DEFAULT_RUNDIR LTTNG_SYSTEM_RUNDIR #define LTTNG_DEFAULT_HOME_RUNDIR ".lttng" -- 2.34.1