From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 13 Apr 2021 21:24:50 +0000 (-0400)
Subject: Fix: perform lazy initialization of getenv common lib
X-Git-Tag: v2.13.0-rc1~107
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=407937dc27362ba6f169a7b2a01e41f4ab6ede82;p=lttng-ust.git

Fix: perform lazy initialization of getenv common lib

The ust-dl wrapper ends up calling into the getenv common lib very early
from library constructors through use of dlopen by the tracepoint
instrumentation code.

This happens before the getenv common lib is explicitly initialized by
liblttng-ust's contructor.

Perform lazy initialization for those early use by constructor
scenarios.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I9f84bb776a62e03b11db0386e267df00eb165ddd
---

diff --git a/src/common/getenv.c b/src/common/getenv.c
index 1909f4cf..23029508 100644
--- a/src/common/getenv.c
+++ b/src/common/getenv.c
@@ -64,8 +64,11 @@ char *lttng_ust_getenv(const char *name)
 	struct lttng_env *e;
 	bool found = false;
 
-	if (!CMM_LOAD_SHARED(lttng_ust_getenv_is_init))
-		abort();
+	/*
+	 * Perform lazy initialization of lttng_ust_getenv for early use
+	 * by library constructors.
+	 */
+	lttng_ust_getenv_init();
 
 	for (i = 0; i < LTTNG_ARRAY_SIZE(lttng_env); i++) {
 		e = &lttng_env[i];