X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fcompile%2Fhello%2Fust_tests_hello.h;h=a949e30fe32c5a4fa41c930911a82cae6561fea1;hb=1d188af9688feee0ec4e34038113a0edccddd4ea;hp=5c2415cdbc6172589def50000ba7256f4b3f5cdd;hpb=c2c72ddee62023174ab8c130c0b51800a8fb01e9;p=lttng-ust.git

diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h
index 5c2415cd..a949e30f 100644
--- a/tests/compile/hello/ust_tests_hello.h
+++ b/tests/compile/hello/ust_tests_hello.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_tests_hello
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_hello
 
 #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_HELLO_H
@@ -20,33 +20,33 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest,
 		double, doublearg, float, floatarg,
 		bool, boolarg),
 	LTTNG_UST_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,
+		lttng_ust_field_integer(int, intfield, anint)
+		lttng_ust_field_integer_hex(int, intfield2, anint)
+		lttng_ust_field_integer(long, longfield, anint)
+		lttng_ust_field_integer_network(int, netintfield, netint)
+		lttng_ust_field_integer_network_hex(int, netintfieldhex, netint)
+		lttng_ust_field_array_nowrite(long, arrfield1z, values, 3)
+		lttng_ust_field_array(long, blah, values, 3)
+		lttng_ust_field_array(long, arrfield1, values, 3)
+		lttng_ust_field_array_hex(long, arrfield1_hex, values, 3)
+		lttng_ust_field_array_network(long, arrfield1_network, values, 3)
+		lttng_ust_field_array_network_hex(long, arrfield1_network_hex, values, 3)
+		lttng_ust_field_array_text(char, arrfield2, text, 10)
+		lttng_ust_field_sequence(char, seqfield1, text,
 			     size_t, textlen)
-		ctf_sequence_nowrite(char, seqfield1z, text,
+		lttng_ust_field_sequence_nowrite(char, seqfield1z, text,
 			     size_t, textlen)
-		ctf_sequence_hex(char, seqfield1_hex, text,
+		lttng_ust_field_sequence_hex(char, seqfield1_hex, text,
 			     size_t, textlen)
-		ctf_sequence_text(char, seqfield2, text,
+		lttng_ust_field_sequence_text(char, seqfield2, text,
 			     size_t, textlen)
-		ctf_sequence_network(long, seqfield_network_3, values,
+		lttng_ust_field_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)
+		lttng_ust_field_float(float, floatfield, floatarg)
+		lttng_ust_field_float(double, doublefield, doublearg)
+		lttng_ust_field_integer(bool, boolfield, boolarg)
+		lttng_ust_field_integer_nowrite(int, filterfield, anint)
 	)
 )
 
@@ -57,8 +57,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>