Tracepoint and TRACEPOINT_EVENT API cleanup

[ust.git] / tests / hello / tp.h

diff --git a/tests/hello/tp.h b/tests/hello/tp.h
index ea401e11b29d9a4a440286edd50f3a1a6c4b50e1..d6d8d99bf39ee7bc7cf58d64c2af5c6ea48ff420 100644 (file)
--- a/tests/hello/tp.h
+++ b/tests/hello/tp.h
@@ -1,5 +1,43 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM tp
+
+#if !defined(_TRACE_TP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_TP_H
+
+/*
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
 #include <ust/tracepoint.h>
 
-DECLARE_TRACE(hello_tptest,
-             TPPROTO(int anint),
-             TPARGS(anint));
+TRACEPOINT_EVENT(hello_tptest,
+                TP_PROTO(int anint),
+                TP_ARGS(anint),
+                TP_FIELDS());
+
+TRACEPOINT_EVENT_NOARGS(hello_tptest2,
+                       TP_FIELDS());
+
+#endif /* _TRACE_TP_H */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE tp
+
+/* This part must be outside protection */
+#include <ust/define_trace.h>