X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-dl%2Flttng-ust-dl.c;h=9b20874a04ca4bb09bbacf8c1b492b2cc2da2c3c;hb=6ba0c2b259f1f99ed3ce8ee2e58e90bc393b704e;hp=62bda028a00cf8411df937b08d217207d1a58d84;hpb=4871194b8eadb66e3a9f00cee0372dd7573567ca;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 62bda028..9b20874a 100644
--- a/src/lib/lttng-ust-dl/lttng-ust-dl.c
+++ b/src/lib/lttng-ust-dl/lttng-ust-dl.c
@@ -21,13 +21,13 @@
 #include <lttng/ust-events.h>
 #include "common/macros.h"
 #include "common/logging.h"
-
-#include "liblttng-ust/ust-events-internal.h"
+#include "common/events.h"
 
 /* Include link.h last else it conflicts with ust-dlfcn. */
 #include <link.h>
 
-#define TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_HIDDEN_DEFINITION
+#define LTTNG_UST_TRACEPOINT_DEFINE
 #include "ust_dl.h"
 
 static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
@@ -37,15 +37,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)
-{
-	ust_err_init();
-}
-
 static
 void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
 {
@@ -128,17 +119,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);
 	}
 
@@ -190,17 +181,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);
 	}
 
@@ -217,7 +208,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;
 
@@ -237,7 +228,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;
 
@@ -258,12 +249,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);
 		}