Tracepoint API namespacing ctf_integer

[lttng-ust.git] / tests / compile / hello.cxx / ust_tests_hello.h

diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h
index 1963e737f4aeef2658efb767aa0158d18f08612d..699a65903e5c271143b0b16095e3631c90690fa1 100644 (file)
--- a/tests/compile/hello.cxx/ust_tests_hello.h
+++ b/tests/compile/hello.cxx/ust_tests_hello.h
@@ -4,17 +4,17 @@
  * 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(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_HELLO_H
 
 #include <lttng/tracepoint.h>
 #include <stddef.h>
 
-TRACEPOINT_ENUM(ust_tests_hello, my_enum,
-       TP_ENUM_VALUES(
+LTTNG_UST_TRACEPOINT_ENUM(ust_tests_hello, my_enum,
+       LTTNG_UST_TP_ENUM_VALUES(
                ctf_enum_value("zero", 0)
                ctf_enum_value("one", 1)
                ctf_enum_auto("two")
@@ -24,17 +24,17 @@ TRACEPOINT_ENUM(ust_tests_hello, my_enum,
        )
 )
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest,
-       TP_ARGS(int, anint, int, netint, long *, values,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest,
+       LTTNG_UST_TP_ARGS(int, anint, int, netint, long *, values,
                 char *, text, size_t, textlen,
                 double, doublearg, float, floatarg,
                 int, enumarg),
-       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)
+       LTTNG_UST_TP_FIELDS(
+               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)
                ctf_array(long, arrfield1, values, 3)
                ctf_array_text(char, arrfield2, text, 10)
                ctf_sequence(char, seqfield1, text,
@@ -48,15 +48,15 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
        )
 )
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
-       TP_ARGS(),
-       TP_FIELDS()
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
+       LTTNG_UST_TP_ARGS(),
+       LTTNG_UST_TP_FIELDS()
 )
 
 #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>