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 833cb40c85fe9a98d3b0341e15627f0e30c25027..d6d8d99bf39ee7bc7cf58d64c2af5c6ea48ff420 100644 (file)
--- a/tests/hello/tp.h
+++ b/tests/hello/tp.h
@@ -1,4 +1,11 @@
-/* Copyright (C) 2009  Pierre-Marc Fournier
+#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
@@ -17,8 +24,20 @@
 
 #include <ust/tracepoint.h>
 
-DECLARE_TRACEPOINT(hello_tptest,
-                  TP_PROTO(int anint),
-                  TP_ARGS(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
 
-DECLARE_TRACEPOINT_NOARGS(hello_tptest2);
+/* This part must be outside protection */
+#include <ust/define_trace.h>