X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=19ce0ceba780b3aa1c1070244e2207544eb7839d;hb=25afb7acba09668c22c9709ff344c4dd92bad1e2;hp=a269104965e9c8348af7bb4a89c3f65ec6d634a9;hpb=2b6f437483769831e50886b9f3bc4710b28f4ac9;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index a2691049..19ce0ceb 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -34,6 +34,7 @@
 #include <lttng/ust.h>
 #include <lttng/ust-error.h>
 #include <lttng/ust-ctl.h>
+#include <lttng/ust-libc-wrapper.h>
 #include <urcu/tls-compat.h>
 #include <ust-comm.h>
 #include <ust-fd.h>
@@ -398,11 +399,11 @@ const char *get_lttng_home_dir(void)
 {
        const char *val;
 
-       val = (const char *) lttng_getenv("LTTNG_HOME");
+       val = (const char *) lttng_ust_getenv("LTTNG_HOME");
        if (val != NULL) {
                return val;
        }
-       return (const char *) lttng_getenv("HOME");
+       return (const char *) lttng_ust_getenv("HOME");
 }
 
 /*
@@ -552,7 +553,7 @@ long get_timeout(void)
 	long constructor_delay_ms = LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS;
 
 	if (!got_timeout_env) {
-		str_timeout = lttng_getenv("LTTNG_UST_REGISTER_TIMEOUT");
+		str_timeout = lttng_ust_getenv("LTTNG_UST_REGISTER_TIMEOUT");
 		got_timeout_env = 1;
 	}
 	if (str_timeout)
@@ -619,7 +620,7 @@ static
 void get_allow_blocking(void)
 {
 	const char *str_allow_blocking =
-		lttng_getenv("LTTNG_UST_ALLOW_BLOCKING");
+		lttng_ust_getenv("LTTNG_UST_ALLOW_BLOCKING");
 
 	if (str_allow_blocking) {
 		DBG("%s environment variable is set",
@@ -2052,7 +2053,7 @@ quit:
  * Weak symbol to call when the ust malloc wrapper is not loaded.
  */
 __attribute__((weak))
-void lttng_ust_malloc_wrapper_init(void)
+void lttng_ust_libc_wrapper_malloc_init(void)
 {
 }
 
@@ -2109,7 +2110,7 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	 */
 	ust_err_init();
 	lttng_ust_getenv_init();	/* Needs ust_err_init() to be completed. */
-	init_tracepoint();
+	lttng_ust_tp_init();
 	lttng_ust_init_fd_tracker();
 	lttng_ust_clock_init();
 	lttng_ust_getcpu_init();
@@ -2125,7 +2126,7 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	/*
 	 * Invoke ust malloc wrapper init before starting other threads.
 	 */
-	lttng_ust_malloc_wrapper_init();
+	lttng_ust_libc_wrapper_malloc_init();
 
 	timeout_mode = get_constructor_timeout(&constructor_timeout);
 
@@ -2269,7 +2270,7 @@ void lttng_ust_cleanup(int exiting)
 	lttng_counter_client_percpu_32_modular_exit();
 	lttng_counter_client_percpu_64_modular_exit();
 	lttng_ust_statedump_destroy();
-	exit_tracepoint();
+	lttng_ust_tp_exit();
 	if (!exiting) {
 		/* Reinitialize values for fork */
 		sem_count = sem_count_initial_value;