X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=51eafdeb5a4cce36e957ede0d5af31557fb5d803;hb=05e8ff1f80c9a6dcd7db559c7a39b4c46e85e2a7;hp=7cfae3e4c10cd65c557a525fdbee063cd6d23c53;hpb=4f74bc5ef1bff1198cf47bd823cc5dc2e8fd9649;p=lttng-ust.git

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 7cfae3e4..51eafdeb 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -35,9 +35,24 @@
 #include <lttng/ust-compiler.h>
 
 #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
-#define SDT_USE_VARIADIC
+/*
+ * Instead of using SDT_USE_VARIADIC from 'sys/sdt.h', use our own namespaced
+ * macros since the instrumented application might already have included
+ * 'sys/sdt.h' without variadic support.
+ */
 #include <sys/sdt.h>
-#define LTTNG_STAP_PROBEV STAP_PROBEV
+
+#define _LTTNG_SDT_NARG(...) \
+	__LTTNG_SDT_NARG(__VA_ARGS__, 12,11,10,9,8,7,6,5,4,3,2,1,0)
+
+#define __LTTNG_SDT_NARG(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12, N, ...) N
+
+#define _LTTNG_SDT_PROBE_N(provider, name, N, ...) \
+	_SDT_PROBE(provider, name, N, (__VA_ARGS__))
+
+#define LTTNG_STAP_PROBEV(provider, name, ...) \
+	_LTTNG_SDT_PROBE_N(provider, name, _LTTNG_SDT_NARG(0, ##__VA_ARGS__), ##__VA_ARGS__)
+
 #else
 #define LTTNG_STAP_PROBEV(...)
 #endif
@@ -165,12 +180,12 @@ void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__));		\
 static											\
 void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__))		\
 {											\
-	struct lttng_ust_tracepoint_probe *__tp_probe;						\
+	struct lttng_ust_tracepoint_probe *__tp_probe;					\
 											\
 	if (caa_unlikely(!TP_RCU_LINK_TEST()))						\
 		return;									\
-	tp_rcu_read_lock_bp();								\
-	__tp_probe = tp_rcu_dereference_bp(__tracepoint_##_provider##___##_name.probes); \
+	tp_rcu_read_lock();								\
+	__tp_probe = tp_rcu_dereference(__tracepoint_##_provider##___##_name.probes);	\
 	if (caa_unlikely(!__tp_probe))							\
 		goto end;								\
 	do {										\
@@ -181,7 +196,7 @@ void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__))		\
 				(_TP_ARGS_DATA_VAR(__VA_ARGS__));			\
 	} while ((++__tp_probe)->func);							\
 end:											\
-	tp_rcu_read_unlock_bp();							\
+	tp_rcu_read_unlock();								\
 }											\
 static inline lttng_ust_notrace								\
 void __tracepoint_register_##_provider##___##_name(char *name,				\
@@ -218,9 +233,9 @@ struct lttng_ust_tracepoint_dlopen {
 	int (*tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start,
 		int tracepoints_count);
 	int (*tracepoint_unregister_lib)(struct lttng_ust_tracepoint * const *tracepoints_start);
-	void (*rcu_read_lock_sym_bp)(void);
-	void (*rcu_read_unlock_sym_bp)(void);
-	void *(*rcu_dereference_sym_bp)(void *p);
+	void (*rcu_read_lock_sym)(void);
+	void (*rcu_read_unlock_sym)(void);
+	void *(*rcu_dereference_sym)(void *p);
 };
 
 extern struct lttng_ust_tracepoint_dlopen tracepoint_dlopen;
@@ -293,21 +308,21 @@ __tracepoint__init_urcu_sym(void)
 	 * Symbols below are needed by tracepoint call sites and probe
 	 * providers.
 	 */
-	if (!tracepoint_dlopen_ptr->rcu_read_lock_sym_bp)
-		tracepoint_dlopen_ptr->rcu_read_lock_sym_bp =
+	if (!tracepoint_dlopen_ptr->rcu_read_lock_sym)
+		tracepoint_dlopen_ptr->rcu_read_lock_sym =
 			URCU_FORCE_CAST(void (*)(void),
 				dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
-					"tp_rcu_read_lock_bp"));
-	if (!tracepoint_dlopen_ptr->rcu_read_unlock_sym_bp)
-		tracepoint_dlopen_ptr->rcu_read_unlock_sym_bp =
+					"tp_rcu_read_lock"));
+	if (!tracepoint_dlopen_ptr->rcu_read_unlock_sym)
+		tracepoint_dlopen_ptr->rcu_read_unlock_sym =
 			URCU_FORCE_CAST(void (*)(void),
 				dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
-					"tp_rcu_read_unlock_bp"));
-	if (!tracepoint_dlopen_ptr->rcu_dereference_sym_bp)
-		tracepoint_dlopen_ptr->rcu_dereference_sym_bp =
+					"tp_rcu_read_unlock"));
+	if (!tracepoint_dlopen_ptr->rcu_dereference_sym)
+		tracepoint_dlopen_ptr->rcu_dereference_sym =
 			URCU_FORCE_CAST(void *(*)(void *p),
 				dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
-					"tp_rcu_dereference_sym_bp"));
+					"tp_rcu_dereference_sym"));
 }
 #else
 static inline void lttng_ust_notrace
@@ -334,7 +349,7 @@ __tracepoints__init(void)
 		tracepoint_dlopen_ptr = &tracepoint_dlopen;
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		tracepoint_dlopen_ptr->liblttngust_handle =
-			dlopen("liblttng-ust-tracepoint.so.0", RTLD_NOW | RTLD_GLOBAL);
+			dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL);
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		return;
 	__tracepoint__init_urcu_sym();
@@ -456,7 +471,7 @@ __tracepoints__ptrs_init(void)
 		tracepoint_dlopen_ptr = &tracepoint_dlopen;
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		tracepoint_dlopen_ptr->liblttngust_handle =
-			dlopen("liblttng-ust-tracepoint.so.0", RTLD_NOW | RTLD_GLOBAL);
+			dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL);
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		return;
 	if (!tracepoint_destructors_syms_ptr)
@@ -464,11 +479,11 @@ __tracepoints__ptrs_init(void)
 	tracepoint_dlopen_ptr->tracepoint_register_lib =
 		URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *, int),
 				dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
-					"tracepoint_register_lib"));
+					"tracepoint_register_lib2"));
 	tracepoint_dlopen_ptr->tracepoint_unregister_lib =
 		URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *),
 				dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
-					"tracepoint_unregister_lib"));
+					"tracepoint_unregister_lib2"));
 	tracepoint_destructors_syms_ptr->old_tracepoint_disable_destructors =
 		URCU_FORCE_CAST(int *,
 				dlsym(tracepoint_dlopen_ptr->liblttngust_handle,