X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fhello%2Fust_tests_hello.h;h=b5f4eb25572d74d410aca6935716ab1d24f6929b;hb=123881664dc99ef7817e8a3e7ca59d5eaa976d06;hp=0f709cb05e9a6576623a1a098d758d43dc5c5296;hpb=513fc97ee8790f552a761f6d99926a567779d4bc;p=lttng-ust.git

diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h
index 0f709cb0..b5f4eb25 100644
--- a/tests/hello/ust_tests_hello.h
+++ b/tests/hello/ust_tests_hello.h
@@ -1,16 +1,20 @@
-#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>
  *
  * 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
@@ -22,39 +26,45 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <ust/tracepoint.h>
-
-TRACEPOINT_EVENT(ust_tests_hello_tptest,
-			TP_PROTO(int anint, long *values,
-				 char *text, size_t textlen,
-				 double doublearg, float floatarg),
-			TP_ARGS(anint, 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_array(long, arrfield1, values, 3)
-				ctf_array_text(char, arrfield2, text, 10)
-				ctf_sequence(char, seqfield1, text,
-					     size_t, textlen)
-				ctf_sequence_text(char, seqfield2, text,
-					     size_t, textlen)
-				ctf_string(stringfield, text)
-				ctf_float(float, floatfield, floatarg)
-				ctf_float(double, doublefield, doublearg)
-			))
-
-TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
-			TP_FIELDS())
-
-#endif /* _TRACEPOINT_TP_H */
+#include <lttng/tracepoint.h>
+
+TRACEPOINT_EVENT(ust_tests_hello, tptest,
+	TP_ARGS(int, anint, int, netint, long *, values,
+		 char *, text, size_t, textlen,
+		 double, doublearg, float, floatarg),
+	TP_FIELDS(
+		ctf_integer(int, intfield, anint)
+		ctf_integer_hex(int, intfield2, 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,
+			     size_t, textlen)
+		ctf_sequence_text(char, seqfield2, text,
+			     size_t, textlen)
+		ctf_string(stringfield, text)
+		ctf_float(float, floatfield, floatarg)
+		ctf_float(double, doublefield, doublearg)
+	)
+)
+
+TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
+	TP_ARGS(),
+	TP_FIELDS()
+)
+
+#endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
 #undef TRACEPOINT_INCLUDE_PATH
 #define TRACEPOINT_INCLUDE_PATH .
 #undef TRACEPOINT_INCLUDE_FILE
 #define TRACEPOINT_INCLUDE_FILE ust_tests_hello
 
-/* This part must be outside protection */
-#include <ust/tracepoint-event.h>
+/* This part must be outside ifdef protection */
+#include <lttng/tracepoint-event.h>
+
+#ifdef __cplusplus 
+}
+#endif