X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-dl%2Flttng-ust-dl.c;h=e342fb2d0ed8b85971e13e51f0da19068d66d5eb;hb=88c7c4eacbd4a98ad8e5df341ae2f1223b735194;hp=2b767e4760e95593518c0ba46a3de1e9aac7068e;hpb=36c52fffa1beb46c7c15bb6ac4a4179cae373b98;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-dl/lttng-ust-dl.c b/src/lib/lttng-ust-dl/lttng-ust-dl.c
index 2b767e47..e342fb2d 100644
--- a/src/lib/lttng-ust-dl/lttng-ust-dl.c
+++ b/src/lib/lttng-ust-dl/lttng-ust-dl.c
@@ -26,7 +26,7 @@
 /* Include link.h last else it conflicts with ust-dlfcn. */
 #include <link.h>
 
-#define TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_DEFINE
 #include "ust_dl.h"
 
 static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
@@ -36,15 +36,6 @@ static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
 #endif
 static int (*__lttng_ust_plibc_dlclose)(void *handle);
 
-static
-void _lttng_ust_dl_init(void)
-	__attribute__((constructor));
-static
-void _lttng_ust_dl_init(void)
-{
-	lttng_ust_logging_init();
-}
-
 static
 void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
 {
@@ -127,17 +118,17 @@ void lttng_ust_dl_dlopen(void *so_base, const char *so_name,
 		goto end;
 	}
 
-	tracepoint(lttng_ust_dl, dlopen,
+	lttng_ust_tracepoint(lttng_ust_dl, dlopen,
 		ip, so_base, resolved_path, flags, memsz,
 		has_build_id, has_debug_link);
 
 	if (has_build_id) {
-		tracepoint(lttng_ust_dl, build_id,
+		lttng_ust_tracepoint(lttng_ust_dl, build_id,
 			ip, so_base, build_id, build_id_len);
 	}
 
 	if (has_debug_link) {
-		tracepoint(lttng_ust_dl, debug_link,
+		lttng_ust_tracepoint(lttng_ust_dl, debug_link,
 			ip, so_base, dbg_file, crc);
 	}
 
@@ -189,17 +180,17 @@ void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
 		goto end;
 	}
 
-	tracepoint(lttng_ust_dl, dlmopen,
+	lttng_ust_tracepoint(lttng_ust_dl, dlmopen,
 		ip, so_base, nsid, resolved_path, flags, memsz,
 		has_build_id, has_debug_link);
 
 	if (has_build_id) {
-		tracepoint(lttng_ust_dl, build_id,
+		lttng_ust_tracepoint(lttng_ust_dl, build_id,
 			ip, so_base, build_id, build_id_len);
 	}
 
 	if (has_debug_link) {
-		tracepoint(lttng_ust_dl, debug_link,
+		lttng_ust_tracepoint(lttng_ust_dl, debug_link,
 			ip, so_base, dbg_file, crc);
 	}
 
@@ -216,7 +207,7 @@ void *dlopen(const char *filename, int flags)
 	void *handle;
 
 	handle = _lttng_ust_dl_libc_dlopen(filename, flags);
-	if (__tracepoint_ptrs_registered && handle) {
+	if (lttng_ust_tracepoint_ptrs_registered && handle) {
 		struct link_map *p = NULL;
 		int ret;
 
@@ -236,7 +227,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags)
 	void *handle;
 
 	handle = _lttng_ust_dl_libc_dlmopen(nsid, filename, flags);
-	if (__tracepoint_ptrs_registered && handle) {
+	if (lttng_ust_tracepoint_ptrs_registered && handle) {
 		struct link_map *p = NULL;
 		int ret;
 
@@ -257,12 +248,12 @@ int dlclose(void *handle)
 {
 	int ret;
 
-	if (__tracepoint_ptrs_registered) {
+	if (lttng_ust_tracepoint_ptrs_registered) {
 		struct link_map *p = NULL;
 
 		ret = dlinfo(handle, RTLD_DI_LINKMAP, &p);
 		if (ret != -1 && p != NULL && p->l_addr != 0) {
-			tracepoint(lttng_ust_dl, dlclose,
+			lttng_ust_tracepoint(lttng_ust_dl, dlclose,
 				LTTNG_UST_CALLER_IP(),
 				(void *) p->l_addr);
 		}