X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fdefine_trace.h;h=14543f929ba7e4dfd82b89fa7d80d55a02bbe363;hb=9edd34bd25f52dd39b354a84f02697254121aefd;hp=9fa2c30d415ad4a987443670c34b0e04c4393292;hpb=22d7294822cce9fdc893b8ab272e322270456ac9;p=ust.git

diff --git a/include/ust/define_trace.h b/include/ust/define_trace.h
index 9fa2c30..14543f9 100644
--- a/include/ust/define_trace.h
+++ b/include/ust/define_trace.h
@@ -1,10 +1,11 @@
 /*
  * Copyright (C) 2009     Steven Rostedt <srostedt@redhat.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
@@ -32,33 +33,28 @@
  *     modules must be used.
  */
 
-#ifdef CREATE_TRACE_POINTS
+#ifdef TRACEPOINT_CREATE_PROBES
 
 /* Prevent recursion */
-#undef CREATE_TRACE_POINTS
+#undef TRACEPOINT_CREATE_PROBES
 
-#include <ust/kcompat/stringify.h>
+#include <ust/stringify.h>
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(name, proto, args, tstruct, assign, print)	\
-	DEFINE_TRACE(name)
+#undef TRACEPOINT_EVENT
+#define TRACEPOINT_EVENT(name, proto, args, fields)		\
+	_DEFINE_TRACEPOINT(name)
 
-#undef TRACE_EVENT_FN
-#define TRACE_EVENT_FN(name, proto, args, tstruct,		\
-		assign, print, reg, unreg)			\
-	DEFINE_TRACE_FN(name, reg, unreg)
+#undef TRACEPOINT_EVENT_INSTANCE
+#define TRACEPOINT_EVENT_INSTANCE(template, name, proto, args)	\
+	_DEFINE_TRACEPOINT(name)
 
-#undef DEFINE_TRACE_EVENT
-#define DEFINE_TRACE_EVENT(template, name, proto, args) \
-	DEFINE_TRACE(name)
+#undef TRACEPOINT_EVENT_NOARGS
+#define TRACEPOINT_EVENT_NOARGS(name, fields)			\
+	_DEFINE_TRACEPOINT(name)
 
-#undef DEFINE_TRACE_EVENT_PRINT
-#define DEFINE_TRACE_EVENT_PRINT(template, name, proto, args, print)	\
-	DEFINE_TRACE(name)
-
-#undef DECLARE_TRACE
-#define DECLARE_TRACE(name, proto, args)	\
-	DEFINE_TRACE(name)
+#undef TRACEPOINT_EVENT_INSTANCE_NOARGS
+#define TRACEPOINT_EVENT_INSTANCE_NOARGS(template, name)	\
+	_DEFINE_TRACEPOINT(name)
 
 #undef TRACE_INCLUDE
 #undef __TRACE_INCLUDE
@@ -82,21 +78,17 @@
 
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
-/* Make all open coded DECLARE_TRACE nops */
-#undef DECLARE_TRACE
-#define DECLARE_TRACE(name, proto, args)
-
 #ifndef CONFIG_NO_EVENT_TRACING
 #include <ust/ust_trace.h>
 #endif
 
-#undef TRACE_EVENT
-#undef TRACE_EVENT_FN
-#undef DECLARE_TRACE_EVENT_CLASS
-#undef DEFINE_TRACE_EVENT
-#undef DEFINE_TRACE_EVENT_PRINT
+#undef TRACEPOINT_EVENT
+#undef TRACEPOINT_EVENT_CLASS
+#undef TRACEPOINT_EVENT_INSTANCE
+#undef TRACEPOINT_EVENT_NOARGS
+#undef TRACEPOINT_EVENT_CLASS_NOARGS
+#undef TRACEPOINT_EVENT_INSTANCE_NOARGS
 #undef TRACE_HEADER_MULTI_READ
-#undef DECLARE_TRACE
 
 /* Only undef what we defined in this file */
 #ifdef UNDEF_TRACE_INCLUDE_FILE
@@ -110,6 +102,6 @@
 #endif
 
 /* We may be processing more files */
-#define CREATE_TRACE_POINTS
+#define TRACEPOINT_CREATE_PROBES
 
-#endif /* CREATE_TRACE_POINTS */
+#endif /* TRACEPOINT_CREATE_PROBES */