X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fhello.cxx%2Fust_tests_hello.h;h=ddb8358723a8cdf79598a1bc838e5b7bf41a43bf;hb=152ba2822ce0dc11947169d2fffe6e0a26a02573;hp=7ce547ed443dcb9a055cef43cd520a0156d829aa;hpb=88392ad78380766c2361e70ec7b7a7527690e167;p=lttng-ust.git

diff --git a/tests/hello.cxx/ust_tests_hello.h b/tests/hello.cxx/ust_tests_hello.h
index 7ce547ed..ddb83587 100644
--- a/tests/hello.cxx/ust_tests_hello.h
+++ b/tests/hello.cxx/ust_tests_hello.h
@@ -7,22 +7,43 @@
 /*
  * 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:
  *
- * 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 above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 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>
 
+TRACEPOINT_ENUM(ust_tests_hello, my_enum,
+	TP_ENUM_VALUES(
+		ctf_enum_value("zero", 0)
+		ctf_enum_value("one", 1)
+		ctf_enum_auto("two")
+		ctf_enum_value("three", 3)
+		ctf_enum_range("ten to twenty", 10, 20)
+		ctf_enum_auto("21!")
+	)
+)
+
 TRACEPOINT_EVENT(ust_tests_hello, tptest,
 	TP_ARGS(int, anint, int, netint, long *, values,
 		 char *, text, size_t, textlen,
-		 double, doublearg, float, floatarg),
+		 double, doublearg, float, floatarg,
+		 int, enumarg),
 	TP_FIELDS(
 		ctf_integer(int, intfield, anint)
 		ctf_integer_hex(int, intfield2, anint)
@@ -38,6 +59,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
 		ctf_string(stringfield, text)
 		ctf_float(float, floatfield, floatarg)
 		ctf_float(double, doublefield, doublearg)
+		ctf_enum(ust_tests_hello, my_enum, int, enumfield, enumarg)
 	)
 )
 
@@ -48,8 +70,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>