X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fdemo%2Fust_tests_demo2.h;h=ffdefa594e695c37cd9aae7a8f99525ca35b9eff;hb=3202f63a4d5e599bf22d6711828614b58c7efcba;hp=fadb1e4e2d6e9fb4474794d3349a80426cf3bd04;hpb=efa14d169c6336fa8b9f478538ac7968ef9c0338;p=lttng-ust.git

diff --git a/doc/examples/demo/ust_tests_demo2.h b/doc/examples/demo/ust_tests_demo2.h
index fadb1e4e..ffdefa59 100644
--- a/doc/examples/demo/ust_tests_demo2.h
+++ b/doc/examples/demo/ust_tests_demo2.h
@@ -4,42 +4,42 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_tests_demo2
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_demo2
 
-#if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO2_H
 
 #include <lttng/tracepoint.h>
 #include <stddef.h>
 
-TRACEPOINT_EVENT(ust_tests_demo2, loop,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo2, loop,
 	LTTNG_UST_TP_ARGS(int, anint, int, netint, long *, values,
 		 char *, text, size_t, textlen,
 		 double, doublearg, float, floatarg),
 	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(long, arrfield1, 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(long, arrfield1, values, 3)
+		lttng_ust_field_array_text(char, arrfield2, text, 10)
+		lttng_ust_field_sequence(char, seqfield1, text,
 			     size_t, textlen)
-		ctf_sequence_text(char, seqfield2, text,
+		lttng_ust_field_sequence_text(char, seqfield2, text,
 			     size_t, textlen)
-		ctf_string(stringfield, text)
-		ctf_float(float, floatfield, floatarg)
-		ctf_float(double, doublefield, doublearg)
+		lttng_ust_field_string(stringfield, text)
+		lttng_ust_field_float(float, floatfield, floatarg)
+		lttng_ust_field_float(double, doublefield, doublearg)
 	)
 )
-TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, TRACE_WARNING)
+LTTNG_UST_TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING)
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO2_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_demo2.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_demo2.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>