X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust%2Fust_trace.h;h=dfbe16648e31985159798446bd82a5c88e1fbf3d;hb=e367f87dd015ac2f8f690761a772f535339733ca;hp=098c5f8f6f0230e31b28bb157b34e7e0d4ffee68;hpb=22d7294822cce9fdc893b8ab272e322270456ac9;p=ust.git

diff --git a/include/ust/ust_trace.h b/include/ust/ust_trace.h
index 098c5f8..dfbe166 100644
--- a/include/ust/ust_trace.h
+++ b/include/ust/ust_trace.h
@@ -1,11 +1,12 @@
 /*
  * Copyright (C) 2009     Steven Rostedt <srostedt@redhat.com>
  * Copyright (C) 2010     Nils Carlson <nils.carlson@ericsson.com>
+ * Copyright (C) 2011     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,27 +16,28 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
- *
  */
 
 /*
- * This whole file is currently a dummy, mapping a TRACE_EVENT
+ * This whole file is currently a dummy, mapping a TRACEPOINT_EVENT
  * to a printf
  */
 
+#include <stdio.h>
+
 /*
  * Stage 1. Create a struct and a printf calling function
  * that is connected to the tracepoint at load time.
  */
-#undef TRACE_EVENT
-#define TRACE_EVENT(name, proto, args, tstruct, assign, print)		\
-	DECLARE_TRACE_EVENT_CLASS(name,					\
-				  PARAMS(proto),			\
-				  PARAMS(args),				\
-				  PARAMS(tstruct),			\
-				  PARAMS(assign),			\
-				  PARAMS(print));			\
-	DEFINE_TRACE_EVENT(name, name, PARAMS(proto), PARAMS(args));
+#undef TRACEPOINT_EVENT
+#define TRACEPOINT_EVENT(name, proto, args, tstruct, assign, print)	\
+	DECLARE_TRACEPOINT_EVENT_CLASS(name,				\
+				  TP_PARAMS(proto),			\
+				  TP_PARAMS(args),			\
+				  TP_PARAMS(tstruct),			\
+				  TP_PARAMS(assign),			\
+				  TP_PARAMS(print));			\
+	DEFINE_TRACEPOINT_EVENT(name, name, TP_PARAMS(proto), TP_PARAMS(args));
 
 #undef __field
 #define __field(type, item)		type	item;
@@ -49,16 +51,16 @@
 #undef TP_fast_assign
 #define TP_fast_assign(args...) args
 
-#undef DEFINE_TRACE_EVENT
-#define DEFINE_TRACE_EVENT(template, name, proto, args)
+#undef DEFINE_TRACEPOINT_EVENT
+#define DEFINE_TRACEPOINT_EVENT(template, name, proto, args)
 
 
-#undef DECLARE_TRACE_EVENT_CLASS
-#define DECLARE_TRACE_EVENT_CLASS(name, proto, args, tstruct, assign, print)	\
+#undef DECLARE_TRACEPOINT_EVENT_CLASS
+#define DECLARE_TRACEPOINT_EVENT_CLASS(name, proto, args, tstruct, assign, print)	\
 	struct trace_raw_##name {					\
 		tstruct							\
 	};								\
-	static void trace_printf_##name(proto)				\
+	static void trace_printf_##name(void *dummy, proto)		\
 	{								\
 		struct trace_raw_##name entry_struct, *__entry;		\
 		__entry = &entry_struct;				\
@@ -66,10 +68,27 @@
 									\
 		printf(print);						\
 	}								\
+	static inline int register_event_##name(void *data)		\
+	{								\
+		return register_tracepoint(name, trace_printf_##name, data); \
+	}								\
+	static inline int unregister_event_##name(void *data)		\
+	{								\
+		return unregister_tracepoint(name, trace_printf_##name, data); \
+	}								\
+	struct trace_event __event_##name = {				\
+		__tpstrtab_##name,					\
+		register_event_##name,					\
+		unregister_event_##name					\
+	};								\
+	static struct trace_event * const __event_ptrs_##name		\
+	__attribute__((used, section("__trace_events_ptrs"))) =		\
+		&__event_##name;					\
+									\
 	static void __attribute__((constructor)) init_##name()		\
 	{								\
-		printf("connecting tracepoint " #name "\n");		\
-		register_trace_##name(trace_printf_##name);		\
+		void *dummy = NULL;					\
+		register_tracepoint(name, trace_printf_##name, dummy);	\
 	}