X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;fp=include%2Flttng%2Ftracepoint.h;h=b1c2d360feffb3de46aa53237ba4d5cd2843d416;hb=2253b139ffb6a4eca7291b60083cc5206a6e128d;hp=5fda51f43bb0aa1f1390f8dc6d00f2bf34b5373d;hpb=a025b017d398818300ad45c92284116d64c56fc1;p=lttng-ust.git

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 5fda51f4..b1c2d360 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -149,7 +149,8 @@ end:											\
 static inline void __tracepoint_register_##_provider##___##_name(char *name,		\
 		void *func, void *data)							\
 {											\
-	__tracepoint_probe_register(name, func, data);					\
+	__tracepoint_probe_register(name, func, data,					\
+		__tracepoint_##_provider##___##_name.signature);			\
 }											\
 static inline void __tracepoint_unregister_##_provider##___##_name(char *name,		\
 		void *func, void *data)							\
@@ -157,7 +158,8 @@ static inline void __tracepoint_unregister_##_provider##___##_name(char *name,
 	__tracepoint_probe_unregister(name, func, data);				\
 }
 
-extern int __tracepoint_probe_register(const char *name, void *func, void *data);
+extern int __tracepoint_probe_register(const char *name, void *func, void *data,
+		const char *signature);
 extern int __tracepoint_probe_unregister(const char *name, void *func, void *data);
 
 /*
@@ -191,10 +193,9 @@ extern struct tracepoint_dlopen tracepoint_dlopen;
  * object from the executable.
  */
 #ifdef TRACEPOINT_PROBE_DYNAMIC_LINKAGE
-#define _TRACEPOINT_UNDEFINED_REF(provider)
+#define _TRACEPOINT_UNDEFINED_REF(provider)	NULL
 #else	/* TRACEPOINT_PROBE_DYNAMIC_LINKAGE */
-#define _TRACEPOINT_UNDEFINED_REF(provider)	\
-	&__tracepoint_provider_##provider,
+#define _TRACEPOINT_UNDEFINED_REF(provider)	&__tracepoint_provider_##provider
 #endif /* TRACEPOINT_PROBE_DYNAMIC_LINKAGE */
 
 /*
@@ -202,17 +203,25 @@ extern struct tracepoint_dlopen tracepoint_dlopen;
  * in the __tracepoints_ptrs section.
  * Therefore, this section is _not_ const (read-only).
  */
-#define _DEFINE_TRACEPOINT(provider, name)					\
-	extern int __tracepoint_provider_##provider; 				\
-	static const char __tp_strtab_##provider##___##name[]			\
+#define _TP_EXTRACT_STRING(...)	#__VA_ARGS__
+
+#define _DEFINE_TRACEPOINT(_provider, _name, _args)				\
+	extern int __tracepoint_provider_##_provider; 				\
+	static const char __tp_strtab_##_provider##___##_name[]			\
 		__attribute__((section("__tracepoints_strings"))) =		\
-			#provider ":" #name;					\
-	struct tracepoint __tracepoint_##provider##___##name			\
+			#_provider ":" #_name;					\
+	struct tracepoint __tracepoint_##_provider##___##_name			\
 		__attribute__((section("__tracepoints"))) =			\
-			{ __tp_strtab_##provider##___##name, 0, NULL, _TRACEPOINT_UNDEFINED_REF(provider) };		\
-	static struct tracepoint * __tracepoint_ptr_##provider##___##name	\
+		{								\
+			__tp_strtab_##_provider##___##_name,			\
+			0,							\
+			NULL,							\
+			_TRACEPOINT_UNDEFINED_REF(_provider), 			\
+			_TP_EXTRACT_STRING(_args),				\
+		};								\
+	static struct tracepoint * __tracepoint_ptr_##_provider##___##_name	\
 		__attribute__((used, section("__tracepoints_ptrs"))) =		\
-			&__tracepoint_##provider##___##name;
+			&__tracepoint_##_provider##___##_name;
 
 /*
  * These weak symbols, the constructor, and destructor take care of
@@ -281,7 +290,7 @@ static void __attribute__((destructor)) __tracepoints__destroy(void)
 
 #else /* TRACEPOINT_DEFINE */
 
-#define _DEFINE_TRACEPOINT(provider, name)
+#define _DEFINE_TRACEPOINT(_provider, _name, _args)
 
 #endif /* #else TRACEPOINT_DEFINE */
 
@@ -376,13 +385,13 @@ static void __attribute__((destructor)) __tracepoints__destroy(void)
 
 #define TRACEPOINT_EVENT(provider, name, args, fields)			\
 	_DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))		\
-	_DEFINE_TRACEPOINT(provider, name)
+	_DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
 
 #define TRACEPOINT_EVENT_CLASS(provider, name, args, fields)
 
 #define TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args)	\
 	_DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))		\
-	_DEFINE_TRACEPOINT(provider, name)
+	_DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
 
 #endif /* #ifndef TRACEPOINT_EVENT */