Remove duplicate provider name checks

[lttng-ust.git] / liblttng-ust / lttng-clock.c

diff --git a/liblttng-ust/lttng-clock.c b/liblttng-ust/lttng-clock.c
index 557fc6b6ccd7c78c612e339ceeea00d3827ba05b..877b5d61955d3f081c0e3f6bdcd85172fb17e59c 100644 (file)
--- a/liblttng-ust/lttng-clock.c
+++ b/liblttng-ust/lttng-clock.c
@@ -17,6 +17,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <error.h>
 #include <dlfcn.h>
 #include <stdlib.h>
@@ -26,12 +27,16 @@
 #include <urcu/arch.h>
 
 #include "clock.h"
+#include "getenv.h"
 
 struct lttng_trace_clock *lttng_trace_clock;
 
 static
 struct lttng_trace_clock user_tc;
 
+static
+void *clock_handle;
+
 int lttng_ust_trace_clock_set_read64_cb(uint64_t (*read64)(void))
 {
        if (CMM_LOAD_SHARED(lttng_trace_clock))
@@ -93,21 +98,21 @@ int lttng_ust_enable_trace_clock_override(void)
 void lttng_ust_clock_init(void)
 {
        const char *libname;
-       void *handle;
        void (*libinit)(void);
 
-
-       libname = secure_getenv("LTTNG_UST_CLOCK_PLUGIN");
+       if (clock_handle)
+               return;
+       libname = lttng_getenv("LTTNG_UST_CLOCK_PLUGIN");
        if (!libname)
                return;
-       handle = dlopen(libname, RTLD_NOW);
-       if (!handle) {
+       clock_handle = dlopen(libname, RTLD_NOW);
+       if (!clock_handle) {
                PERROR("Cannot load LTTng UST clock override library %s",
                        libname);
                return;
        }
        dlerror();
-       libinit = (void (*)(void)) dlsym(handle,
+       libinit = (void (*)(void)) dlsym(clock_handle,
                "lttng_ust_clock_plugin_init");
        if (!libinit) {
                PERROR("Cannot find LTTng UST clock override library %s initialization function lttng_ust_clock_plugin_init()",