X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=49db615a0996e49b067534e388baaa360a820292;hb=74d65852d2dcb025a00fa5abcb56f6b7521395a4;hp=71f3e36c856af7ddffdddf23e5e8e57cc23e82fc;hpb=f641d544ea2630c5a52c0cbc5db947d34461cea7;p=lttng-ust.git

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 71f3e36c..49db615a 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -15,8 +15,10 @@
 #include <urcu/system.h>
 #include <dlfcn.h>	/* for dlopen */
 #include <string.h>	/* for memset */
+
 #include <lttng/ust-config.h>	/* for sdt */
 #include <lttng/ust-compiler.h>
+#include <lttng/ust-tracer.h>
 
 #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
 /*
@@ -159,8 +161,9 @@ extern "C" {
  */
 #define _DECLARE_TRACEPOINT(_provider, _name, ...)			 		\
 extern struct lttng_ust_tracepoint __tracepoint_##_provider##___##_name;		\
-static inline __attribute__((always_inline, unused)) lttng_ust_notrace			\
-void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__));		\
+static inline										\
+void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__))		\
+	__attribute__((always_inline, unused)) lttng_ust_notrace;			\
 static											\
 void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__))		\
 {											\
@@ -182,9 +185,10 @@ void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__))		\
 end:											\
 	tp_rcu_read_unlock();								\
 }											\
-static inline lttng_ust_notrace								\
+static inline										\
 void __tracepoint_register_##_provider##___##_name(char *name,				\
-		void (*func)(void), void *data);					\
+		void (*func)(void), void *data)						\
+	lttng_ust_notrace;								\
 static inline										\
 void __tracepoint_register_##_provider##___##_name(char *name,				\
 		void (*func)(void), void *data)						\
@@ -192,9 +196,10 @@ void __tracepoint_register_##_provider##___##_name(char *name,				\
 	__tracepoint_probe_register(name, func, data,					\
 		__tracepoint_##_provider##___##_name.signature);			\
 }											\
-static inline lttng_ust_notrace								\
+static inline										\
 void __tracepoint_unregister_##_provider##___##_name(char *name,			\
-		void (*func)(void), void *data);					\
+		void (*func)(void), void *data)						\
+	lttng_ust_notrace;								\
 static inline										\
 void __tracepoint_unregister_##_provider##___##_name(char *name,			\
 		void (*func)(void), void *data)						\
@@ -307,8 +312,9 @@ static inline void tracepoint_disable_destructors(void)
 }
 
 #ifndef _LGPL_SOURCE
-static inline void lttng_ust_notrace
-__tracepoint__init_urcu_sym(void);
+static inline void
+__tracepoint__init_urcu_sym(void)
+	lttng_ust_notrace;
 static inline void
 __tracepoint__init_urcu_sym(void)
 {
@@ -335,16 +341,18 @@ __tracepoint__init_urcu_sym(void)
 					"tp_rcu_dereference_sym"));
 }
 #else
-static inline void lttng_ust_notrace
-__tracepoint__init_urcu_sym(void);
+static inline void
+__tracepoint__init_urcu_sym(void)
+	lttng_ust_notrace;
 static inline void
 __tracepoint__init_urcu_sym(void)
 {
 }
 #endif
 
-static void lttng_ust_notrace __attribute__((constructor))
-__tracepoints__init(void);
+static void
+__tracepoints__init(void)
+	lttng_ust_notrace __attribute__((constructor));
 static void
 __tracepoints__init(void)
 {
@@ -359,14 +367,15 @@ __tracepoints__init(void)
 		tracepoint_dlopen_ptr = &tracepoint_dlopen;
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		tracepoint_dlopen_ptr->liblttngust_handle =
-			dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL);
+			dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL);
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		return;
 	__tracepoint__init_urcu_sym();
 }
 
-static void lttng_ust_notrace __attribute__((destructor))
-__tracepoints__destroy(void);
+static void
+__tracepoints__destroy(void)
+	lttng_ust_notrace __attribute__((destructor));
 static void
 __tracepoints__destroy(void)
 {
@@ -456,8 +465,9 @@ extern struct lttng_ust_tracepoint * const __stop___tracepoints_ptrs[]
 		__lttng_ust_variable_attribute_no_sanitize_address =		\
 			&__tracepoint_##_provider##___##_name;
 
-static void lttng_ust_notrace __attribute__((constructor))
-__tracepoints__ptrs_init(void);
+static void
+__tracepoints__ptrs_init(void)
+	lttng_ust_notrace __attribute__((constructor));
 static void
 __tracepoints__ptrs_init(void)
 {
@@ -467,7 +477,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.1", RTLD_NOW | RTLD_GLOBAL);
+			dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL);
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		return;
 	if (!tracepoint_destructors_syms_ptr)
@@ -496,8 +506,9 @@ __tracepoints__ptrs_init(void)
 	}
 }
 
-static void lttng_ust_notrace __attribute__((destructor))
-__tracepoints__ptrs_destroy(void);
+static void
+__tracepoints__ptrs_destroy(void)
+	lttng_ust_notrace __attribute__((destructor));
 static void
 __tracepoints__ptrs_destroy(void)
 {