X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=f2a65777c7a4b4549d9900d49d887464f9e3ce2a;hb=14227bde84a144ed425a12d47337ade48e50bd4e;hp=23f01547720b67a5068eb940df210c6714c6467e;hpb=29d6f42146cb632bd8c8cee3d087aefc0f84dd91;p=lttng-ust.git

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 23f01547..f2a65777 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -216,7 +216,7 @@ static inline										\
 void lttng_ust_tracepoint_register_##_provider##___##_name(char *provider_name, char *event_name, \
 		void (*func)(void), void *data)						\
 {											\
-	lttng_ust_tracepoint_probe_register(provider_name, event_name, func, data,		\
+	lttng_ust_tracepoint_provider_register(provider_name, event_name, func, data,		\
 		lttng_ust_tracepoint_##_provider##___##_name.signature);			\
 }											\
 static inline										\
@@ -227,12 +227,12 @@ static inline										\
 void lttng_ust_tracepoint_unregister_##_provider##___##_name(char *provider_name, char *event_name, \
 		void (*func)(void), void *data)						\
 {											\
-	lttng_ust_tracepoint_probe_unregister(provider_name, event_name, func, data);		\
+	lttng_ust_tracepoint_provider_unregister(provider_name, event_name, func, data);		\
 }
 
-extern int lttng_ust_tracepoint_probe_register(const char *provider_name, const char *event_name,
+extern int lttng_ust_tracepoint_provider_register(const char *provider_name, const char *event_name,
 		void (*func)(void), void *data, const char *signature);
-extern int lttng_ust_tracepoint_probe_unregister(const char *provider_name, const char *event_name,
+extern int lttng_ust_tracepoint_provider_unregister(const char *provider_name, const char *event_name,
 		void (*func)(void), void *data);
 
 /*
@@ -252,9 +252,9 @@ struct lttng_ust_tracepoint_dlopen {
 
 	void *liblttngust_handle;
 
-	int (*lttng_ust_tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start,
+	int (*lttng_ust_tracepoint_module_register)(struct lttng_ust_tracepoint * const *tracepoints_start,
 		int tracepoints_count);
-	int (*lttng_ust_tracepoint_unregister_lib)(struct lttng_ust_tracepoint * const *tracepoints_start);
+	int (*lttng_ust_tracepoint_module_unregister)(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);
@@ -525,14 +525,14 @@ 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->lttng_ust_tracepoint_register_lib =
+	lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_register =
 		URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *, int),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-					"lttng_ust_tracepoint_register_lib"));
-	lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib =
+					"lttng_ust_tracepoint_module_register"));
+	lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_unregister =
 		URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-					"lttng_ust_tracepoint_unregister_lib"));
+					"lttng_ust_tracepoint_module_unregister"));
 	lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_disable_destructors =
 		URCU_FORCE_CAST(void (*)(void),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
@@ -542,8 +542,8 @@ lttng_ust__tracepoints__ptrs_init(void)
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
 					"lttng_ust_tp_get_destructors_state"));
 	lttng_ust_tracepoint__init_urcu_sym();
-	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,
+	if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_register) {
+		lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_register(__start_lttng_ust_tracepoints_ptrs,
 				__stop_lttng_ust_tracepoints_ptrs -
 				__start_lttng_ust_tracepoints_ptrs);
 	}
@@ -563,8 +563,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->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->lttng_ust_tracepoint_module_unregister)
+		lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_unregister(__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()