From 30e43da7276e68767cc901491d899fd360b016f7 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 12 Jul 2016 16:22:36 -0400 Subject: [PATCH] Revert "Introduce LTTNG_UST_LOADED environment variable" This reverts commit 2315088b93f925c5cccee865ccb8f6bc542e52dc. We will introduce a solution based on a weak symbol instead, which does not "leak" to children's exec. Signed-off-by: Mathieu Desnoyers --- doc/man/lttng-ust.3.txt | 9 --------- liblttng-ust/lttng-ust-comm.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/doc/man/lttng-ust.3.txt b/doc/man/lttng-ust.3.txt index a1d4f204..7a23943d 100644 --- a/doc/man/lttng-ust.3.txt +++ b/doc/man/lttng-ust.3.txt @@ -1113,15 +1113,6 @@ are located in a specific directory under `$LTTNG_HOME` (or `$HOME` if documentation under https://github.com/lttng/lttng-ust/tree/master/doc/examples/getcpu-override[`examples/getcpu-override`]. -`LTTNG_UST_LOADED`:: - Set internally by `liblttng-ust`'s constructor. Can be used by - applications to detect if lttng-ust is loaded, even if liblttng-ust - is not directly linked by the application. This environment - variable stays set across fork and exec, so an application could - observe this environment variable being set if a parent process had - lttng-ust loaded when issuing fork, even if this application does - not have lttng-ust in its address space. - `LTTNG_UST_REGISTER_TIMEOUT`:: Waiting time for the _registration done_ session daemon command before proceeding to execute the main program (milliseconds). diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c index cc9b6b5e..6105403a 100644 --- a/liblttng-ust/lttng-ust-comm.c +++ b/liblttng-ust/lttng-ust-comm.c @@ -1547,13 +1547,6 @@ void lttng_ust_malloc_wrapper_init(void) { } -static -void init_ust_env(void) -{ - if (putenv("LTTNG_UST_LOADED=1")) - DBG("Error setting LTTNG_UST_LOADED environment variable"); -} - /* * sessiond monitoring thread: monitor presence of global and per-user * sessiond by polling the application common named pipe. @@ -1581,8 +1574,6 @@ void __attribute__((constructor)) lttng_ust_init(void) lttng_fixup_procname_tls(); lttng_fixup_ust_mutex_nest_tls(); - init_ust_env(); - /* * We want precise control over the order in which we construct * our sub-libraries vs starting to receive commands from -- 2.34.1