X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=420657673e9c6e74800bf2cbb24e91facebefd56;hb=251c9f75028bda8453a048978ec221b70a652153;hp=5d30703e3039603f272361122ce98b19962b9f66;hpb=dbcc2f9279a03c620350b4743467aa2f7cb7bf5f;p=lttng-ust.git

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 5d30703e..42065767 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -191,10 +191,10 @@ void lttng_ust_tracepoint_cb_##_provider##___##_name(LTTNG_UST__TP_ARGS_PROTO(__
 {											\
 	struct lttng_ust_tracepoint_probe *__tp_probe;					\
 											\
-	if (caa_unlikely(!TP_RCU_LINK_TEST()))						\
+	if (caa_unlikely(!LTTNG_UST_TP_RCU_LINK_TEST()))						\
 		return;									\
-	tp_rcu_read_lock();								\
-	__tp_probe = tp_rcu_dereference(lttng_ust_tracepoint_##_provider##___##_name.probes);	\
+	lttng_ust_tp_rcu_read_lock();								\
+	__tp_probe = lttng_ust_tp_rcu_dereference(lttng_ust_tracepoint_##_provider##___##_name.probes);	\
 	if (caa_unlikely(!__tp_probe))							\
 		goto end;								\
 	do {										\
@@ -205,7 +205,7 @@ void lttng_ust_tracepoint_cb_##_provider##___##_name(LTTNG_UST__TP_ARGS_PROTO(__
 				(LTTNG_UST__TP_ARGS_DATA_VAR(__VA_ARGS__));			\
 	} while ((++__tp_probe)->func);							\
 end:											\
-	tp_rcu_read_unlock();								\
+	lttng_ust_tp_rcu_read_unlock();								\
 }											\
 static inline										\
 void lttng_ust_tracepoint_register_##_provider##___##_name(char *provider_name, char *event_name, \
@@ -350,17 +350,17 @@ lttng_ust_tracepoint__init_urcu_sym(void)
 		lttng_ust_tracepoint_dlopen_ptr->rcu_read_lock_sym =
 			URCU_FORCE_CAST(void (*)(void),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-					"tp_rcu_read_lock"));
+					"lttng_ust_tp_rcu_read_lock"));
 	if (!lttng_ust_tracepoint_dlopen_ptr->rcu_read_unlock_sym)
 		lttng_ust_tracepoint_dlopen_ptr->rcu_read_unlock_sym =
 			URCU_FORCE_CAST(void (*)(void),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-					"tp_rcu_read_unlock"));
+					"lttng_ust_tp_rcu_read_unlock"));
 	if (!lttng_ust_tracepoint_dlopen_ptr->rcu_dereference_sym)
 		lttng_ust_tracepoint_dlopen_ptr->rcu_dereference_sym =
 			URCU_FORCE_CAST(void *(*)(void *p),
 				dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-					"tp_rcu_dereference_sym"));
+					"lttng_ust_tp_rcu_dereference_sym"));
 }
 #else
 static inline void
@@ -609,7 +609,7 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  * An example:
  *
  * LTTNG_UST_TRACEPOINT_ENUM(someproject_component, enumname,
- *	TP_ENUM_VALUES(
+ *	LTTNG_UST_TP_ENUM_VALUES(
  *		ctf_enum_value("even", 0)
  *		ctf_enum_value("uneven", 1)
  *		ctf_enum_range("twoto4", 2, 4)
@@ -619,7 +619,7 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  *
  * Where "someproject_component" is the name of the component this enumeration
  * belongs to and "enumname" identifies this enumeration. Inside the
- * TP_ENUM_VALUES macro is the actual mapping. Each string value can map
+ * LTTNG_UST_TP_ENUM_VALUES macro is the actual mapping. Each string value can map
  * to either a single value with ctf_enum_value or a range of values
  * with ctf_enum_range.
  *
@@ -815,7 +815,7 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  *      LTTNG_UST_TRACEPOINT_LOGLEVEL(< [com_company_]project[_component] >, < event >,
  *              < loglevel_name >)
  *
- * The TRACEPOINT_PROVIDER must be already declared before declaring a
+ * The LTTNG_UST_TRACEPOINT_PROVIDER must be already declared before declaring a
  * LTTNG_UST_TRACEPOINT_LOGLEVEL.
  */