Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make code and man pages share the same default values #24

Closed
wants to merge 1 commit into from
Closed

Make code and man pages share the same default values #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,15 @@ and installing the man pages.
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])

AC_CONFIG_FILES([
Makefile
doc/Makefile
Expand Down
3 changes: 2 additions & 1 deletion doc/man/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ if MAN_PAGES_OPT
if HAVE_ASCIIDOC_XMLTO
# Tools to execute:
ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -d manpage \
-a lttng_version="$(PACKAGE_VERSION)"
-a lttng_version="$(PACKAGE_VERSION)" \
-a lttng_ust_register_timeout="@LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS@"
ADOC_DOCBOOK = $(ADOC) -b docbook
XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man

Expand Down
2 changes: 1 addition & 1 deletion doc/man/lttng-ust.3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,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: 3000.
Default: {lttng_ust_register_timeout}.

`LTTNG_UST_WITHOUT_BADDR_STATEDUMP`::
Prevent `liblttng-ust` from performing a base address state dump
Expand Down
2 changes: 1 addition & 1 deletion include/ust-comm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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 3000
#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS CONFIG_LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS

#define LTTNG_DEFAULT_RUNDIR LTTNG_SYSTEM_RUNDIR
#define LTTNG_DEFAULT_HOME_RUNDIR ".lttng"
Expand Down