X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-getcpu.c;h=7cc9faa8c40f9af8cd38353ff62df44eaa1421a6;hb=09434f96935202d1e6cf64a74d4da4b95d06246d;hp=8f4c0fe7eeb6ba92c236bd2715709348c7ec45d8;hpb=5e1b7b8bac9f038e681906b269c1422611c6376d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-getcpu.c b/liblttng-ust/lttng-getcpu.c
index 8f4c0fe7..7cc9faa8 100644
--- a/liblttng-ust/lttng-getcpu.c
+++ b/liblttng-ust/lttng-getcpu.c
@@ -17,6 +17,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <error.h>
 #include <dlfcn.h>
 #include <stdlib.h>
@@ -25,10 +26,14 @@
 #include <urcu/system.h>
 #include <urcu/arch.h>
 
+#include "getenv.h"
 #include "../libringbuffer/getcpu.h"
 
 int (*lttng_get_cpu)(void);
 
+static
+void *getcpu_handle;
+
 int lttng_ust_getcpu_override(int (*getcpu)(void))
 {
 	CMM_STORE_SHARED(lttng_get_cpu, getcpu);
@@ -38,20 +43,21 @@ int lttng_ust_getcpu_override(int (*getcpu)(void))
 void lttng_ust_getcpu_init(void)
 {
 	const char *libname;
-	void *handle;
 	void (*libinit)(void);
 
-	libname = secure_getenv("LTTNG_UST_GETCPU_PLUGIN");
+	if (getcpu_handle)
+		return;
+	libname = lttng_getenv("LTTNG_UST_GETCPU_PLUGIN");
 	if (!libname)
 		return;
-	handle = dlopen(libname, RTLD_NOW);
-	if (!handle) {
+	getcpu_handle = dlopen(libname, RTLD_NOW);
+	if (!getcpu_handle) {
 		PERROR("Cannot load LTTng UST getcpu override library %s",
 			libname);
 		return;
 	}
 	dlerror();
-	libinit = (void (*)(void)) dlsym(handle,
+	libinit = (void (*)(void)) dlsym(getcpu_handle,
 		"lttng_ust_getcpu_plugin_init");
 	if (!libinit) {
 		PERROR("Cannot find LTTng UST getcpu override library %s initialization function lttng_ust_getcpu_plugin_init()",