Tracepoint API namespacing ctf_string

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

diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h
index e25ebb07cfa5b10bf8adfaeff553c2eb8d0e6af8..639c7c9f89e3e2f2772c76e312458d53cebafe0b 100644 (file)
--- 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_string(stringfield, text)
+               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)
        )
 )