X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events%2Ftp.h;h=08c5f92de0105cea2a76745139dc19fe12818c6c;hb=28f23191dcbf047429d51950a337a57d7a3f866a;hp=bc1949417118dd54b4d2d618571eb4af163329f0;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/utils/testapp/gen-ust-events/tp.h b/tests/utils/testapp/gen-ust-events/tp.h
index bc1949417..08c5f92de 100644
--- a/tests/utils/testapp/gen-ust-events/tp.h
+++ b/tests/utils/testapp/gen-ust-events/tp.h
@@ -13,30 +13,111 @@
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(tp, tptest,
-	TP_ARGS(int, anint, int, netint, long *, values,
-		char *, text, size_t, textlen,
-		double, doublearg, float, floatarg),
+#include <stdint.h>
+
+TRACEPOINT_ENUM(tp,
+		tptest_enum,
+		TP_ENUM_VALUES(ctf_enum_auto("AUTO: EXPECT 0") ctf_enum_value("VALUE: 23", 23)
+				       ctf_enum_value("VALUE: 27",
+						      27) ctf_enum_auto("AUTO: EXPECT 28")
+					       ctf_enum_range("RANGE: 101 TO 303", 101, 303)
+						       ctf_enum_auto("AUTO: EXPECT 304")
+							       ctf_enum_value("VALUE: -1", -1)))
+
+TRACEPOINT_EVENT(
+	tp,
+	tptest,
+	TP_ARGS(int,
+		anint,
+		int,
+		netint,
+		long *,
+		values,
+		char *,
+		text,
+		size_t,
+		textlen,
+		char *,
+		etext,
+		uint32_t *,
+		net_values,
+		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)
-	)
-)
+		ctf_integer(int, intfield, anint) ctf_integer_hex(int, intfield2, anint) ctf_integer(
+			long, longfield, anint) ctf_integer(int,
+							    signedfield,
+							    -1) 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_array_network(uint32_t,
+									arrfield3,
+									net_values,
+									3) ctf_sequence(char,
+											seqfield1,
+											text,
+											size_t,
+											textlen)
+				ctf_sequence_text(char,
+						  seqfield2,
+						  text,
+						  size_t,
+						  textlen) ctf_sequence_network(uint32_t,
+										seqfield3,
+										net_values,
+										size_t,
+										3)
+					ctf_sequence(long, seqfield4, values, size_t, 3) ctf_string(
+						stringfield,
+						text) ctf_string(stringfield2,
+								 etext) ctf_float(float,
+										  floatfield,
+										  floatarg)
+						ctf_float(double, doublefield, doublearg) ctf_enum(
+							tp,
+							tptest_enum,
+							int,
+							enum0,
+							0) ctf_enum(tp,
+								    tptest_enum,
+								    int,
+								    enum23,
+								    23) ctf_enum(tp,
+										 tptest_enum,
+										 int,
+										 enum27,
+										 27)
+							ctf_enum(tp, tptest_enum, int, enum28, 28)
+								ctf_enum(tp,
+									 tptest_enum,
+									 int,
+									 enum202,
+									 202) ctf_enum(tp,
+										       tptest_enum,
+										       int,
+										       enum304,
+										       304)
+									ctf_enum(tp,
+										 tptest_enum,
+										 int,
+										 enumnegative,
+										 -1)))
+
+TRACEPOINT_EVENT(tp, end, TP_ARGS(), TP_FIELDS())
 
 #endif /* _TRACEPOINT_TP_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./tp.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./tp.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>