X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=tests%2Fhello%2Ftp.h;h=7fa16e904c835ac5145d4e8d4aed459e7786bb6a;hb=1dbfff0c0126804b07e9c11ba2307f65a95a650b;hp=d6d8d99bf39ee7bc7cf58d64c2af5c6ea48ff420;hpb=8161463975e218e0833d31ab1577a7ceb9e8e9f3;p=lttng-ust.git

diff --git a/tests/hello/tp.h b/tests/hello/tp.h
index d6d8d99b..7fa16e90 100644
--- a/tests/hello/tp.h
+++ b/tests/hello/tp.h
@@ -1,8 +1,8 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM tp
+#undef TRACEPOINT_SYSTEM
+#define TRACEPOINT_SYSTEM tp
 
-#if !defined(_TRACE_TP_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_TP_H
+#if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define _TRACEPOINT_TP_H
 
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -24,20 +24,22 @@
 
 #include <ust/tracepoint.h>
 
-TRACEPOINT_EVENT(hello_tptest,
-		 TP_PROTO(int anint),
-		 TP_ARGS(anint),
-		 TP_FIELDS());
+TRACEPOINT_EVENT(ust_tests_hello_tptest,
+			TP_PROTO(int anint),
+			TP_ARGS(anint),
+			TP_FIELDS(
+				ctf_integer(int, intfield, anint)
+			))
 
-TRACEPOINT_EVENT_NOARGS(hello_tptest2,
-			TP_FIELDS());
+TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
+			TP_FIELDS())
 
-#endif /* _TRACE_TP_H */
+#endif /* _TRACEPOINT_TP_H */
 
-#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
-#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE tp
+#undef TRACEPOINT_INCLUDE_PATH
+#define TRACEPOINT_INCLUDE_PATH .
+#undef TRACEPOINT_INCLUDE_FILE
+#define TRACEPOINT_INCLUDE_FILE tp
 
 /* This part must be outside protection */
-#include <ust/define_trace.h>
+#include <ust/tracepoint-event.h>