X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fhello%2Fust_tests_hello.h;h=86e4ce7d2d84e6a74d5910f638d0484c07933b0b;hb=a4ada9b87a62c26061c109abe0fd502e16f03db2;hp=9f6ab9b8ca8f8adf7d20e8e4a67559c835dfaafa;hpb=e1eb29be4cd2b8431d8ab33b4071318d5c7cb741;p=lttng-ust.git

diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h
index 9f6ab9b8..86e4ce7d 100644
--- a/tests/hello/ust_tests_hello.h
+++ b/tests/hello/ust_tests_hello.h
@@ -1,9 +1,13 @@
-#undef TRACEPOINT_SYSTEM
-#define TRACEPOINT_SYSTEM ust_tests_hello
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER ust_tests_hello
 
 #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_HELLO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
@@ -22,19 +26,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <ust/tracepoint.h>
+#include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_hello_tptest,
-	TP_PROTO(int anint, long *values,
+TRACEPOINT_EVENT(ust_tests_hello, tptest,
+	TP_PROTO(int anint, int netint, long *values,
 		 char *text, size_t textlen,
 		 double doublearg, float floatarg),
-	TP_ARGS(anint, values, text, textlen,
+	TP_VARS(anint, netint, values, text, textlen,
 		doublearg, floatarg),
 	TP_FIELDS(
 		ctf_integer(int, intfield, anint)
 		ctf_integer_hex(int, intfield2, anint)
-		ctf_integer_network(int, intfield3, anint)
-		ctf_integer_network_hex(int, intfield4, anint)
+		ctf_integer(long, longfield, anint)
+		ctf_integer_network(int, netintfield, netint)
+		ctf_integer_network_hex(int, netintfieldhex, netint)
 		ctf_array(long, arrfield1, values, 3)
 		ctf_array_text(char, arrfield2, text, 10)
 		ctf_sequence(char, seqfield1, text,
@@ -47,7 +52,7 @@ TRACEPOINT_EVENT(ust_tests_hello_tptest,
 	)
 )
 
-TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
+TRACEPOINT_EVENT_NOARGS(ust_tests_hello, tptest_sighandler,
 	TP_FIELDS()
 )
 
@@ -59,4 +64,8 @@ TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
 #define TRACEPOINT_INCLUDE_FILE ust_tests_hello
 
 /* This part must be outside protection */
-#include <ust/tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
+
+#ifdef __cplusplus 
+}
+#endif