X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fhello%2Fust_tests_hello.h;h=372828f83474b4228551ca960b0e8f10b9afd859;hb=c95c332aeedc4c5af4aa4988f3379b500a852fab;hp=a54bc595650da4dadd505ef5d1ec152f55b4c26b;hpb=8511626a5d7af3d9c447f64dd1ecd9e2ce22763a;p=lttng-ust.git

diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h
index a54bc595..372828f8 100644
--- a/tests/hello/ust_tests_hello.h
+++ b/tests/hello/ust_tests_hello.h
@@ -4,44 +4,64 @@
 #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 MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <lttng/tracepoint.h>
+#include <stdbool.h>
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest,
 	TP_ARGS(int, anint, int, netint, long *, values,
-		 char *, text, size_t, textlen,
-		 double, doublearg, float, floatarg),
+		char *, text, size_t, textlen,
+		double, doublearg, float, floatarg,
+		bool, boolarg),
 	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_nowrite(long, arrfield1z, values, 3)
+		ctf_array(long, blah, values, 3)
 		ctf_array(long, arrfield1, values, 3)
+		ctf_array_hex(long, arrfield1_hex, values, 3)
+		ctf_array_network(long, arrfield1_network, values, 3)
+		ctf_array_network_hex(long, arrfield1_network_hex, values, 3)
 		ctf_array_text(char, arrfield2, text, 10)
 		ctf_sequence(char, seqfield1, text,
 			     size_t, textlen)
+		ctf_sequence_nowrite(char, seqfield1z, text,
+			     size_t, textlen)
+		ctf_sequence_hex(char, seqfield1_hex, text,
+			     size_t, textlen)
 		ctf_sequence_text(char, seqfield2, text,
 			     size_t, textlen)
+		ctf_sequence_network(long, seqfield_network_3, values,
+			     size_t, 3)
 		ctf_string(stringfield, text)
 		ctf_float(float, floatfield, floatarg)
 		ctf_float(double, doublefield, doublearg)
+		ctf_integer(bool, boolfield, boolarg)
+		ctf_integer_nowrite(int, filterfield, anint)
 	)
 )
 
@@ -52,12 +72,8 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_hello.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus 
-}
-#endif