X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=b02ec3301893d563b0ca17bf1ddf4279a623ddae;hb=096c06e5c6f0a44f261b53c473c223ba88b686fd;hp=dbaf795d15a81aba40881a476e4408a2cd665792;hpb=92866a9dad57a5bd36286808155318cf8587fe2d;p=lttng-ust.git

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index dbaf795d..b02ec330 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -251,9 +251,9 @@ struct lttng_ust_tracepoint_dlopen {
 
 	void *liblttngust_handle;
 
-	int (*tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start,
+	int (*lttng_ust_tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start,
 		int tracepoints_count);
-	int (*tracepoint_unregister_lib)(struct lttng_ust_tracepoint * const *tracepoints_start);
+	int (*lttng_ust_tracepoint_unregister_lib)(struct lttng_ust_tracepoint * const *tracepoints_start);
 	void (*rcu_read_lock_sym)(void);
 	void (*rcu_read_unlock_sym)(void);
 	void *(*rcu_dereference_sym)(void *p);
@@ -516,25 +516,25 @@ lttng_ust__tracepoints__ptrs_init(void)
 		return;
 	if (!lttng_ust_tracepoint_destructors_syms_ptr)
 		lttng_ust_tracepoint_destructors_syms_ptr = &lttng_ust_tracepoint_destructors_syms;
-	lttng_ust_tracepoint_dlopen_ptr->tracepoint_register_lib =
+	lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_register_lib =
 		URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *, int),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-					"tracepoint_register_lib"));
-	lttng_ust_tracepoint_dlopen_ptr->tracepoint_unregister_lib =
+					"lttng_ust_tracepoint_register_lib"));
+	lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib =
 		URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-					"tracepoint_unregister_lib"));
+					"lttng_ust_tracepoint_unregister_lib"));
 	lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_disable_destructors =
 		URCU_FORCE_CAST(void (*)(void),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-					"tp_disable_destructors"));
+					"lttng_ust_tp_disable_destructors"));
 	lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state =
 		URCU_FORCE_CAST(int (*)(void),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-					"tp_get_destructors_state"));
+					"lttng_ust_tp_get_destructors_state"));
 	lttng_ust_tracepoint__init_urcu_sym();
-	if (lttng_ust_tracepoint_dlopen_ptr->tracepoint_register_lib) {
-		lttng_ust_tracepoint_dlopen_ptr->tracepoint_register_lib(__start_lttng_ust_tracepoints_ptrs,
+	if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_register_lib) {
+		lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_register_lib(__start_lttng_ust_tracepoints_ptrs,
 				__stop_lttng_ust_tracepoints_ptrs -
 				__start_lttng_ust_tracepoints_ptrs);
 	}
@@ -554,8 +554,8 @@ lttng_ust__tracepoints__ptrs_destroy(void)
 		lttng_ust_tracepoint_dlopen_ptr = &lttng_ust_tracepoint_dlopen;
 	if (!lttng_ust_tracepoint_destructors_syms_ptr)
 		lttng_ust_tracepoint_destructors_syms_ptr = &lttng_ust_tracepoint_destructors_syms;
-	if (lttng_ust_tracepoint_dlopen_ptr->tracepoint_unregister_lib)
-		lttng_ust_tracepoint_dlopen_ptr->tracepoint_unregister_lib(__start_lttng_ust_tracepoints_ptrs);
+	if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib)
+		lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib(__start_lttng_ust_tracepoints_ptrs);
 	if (lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle
 			&& lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state
 			&& lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state()