Tracepoint API namespacing 'TP_FIELDS'

The ABI bump gives us the opportunity to namespace all public symbols
under the 'lttng_ust_' prefix. Namespace all API symbols and macros
under 'lttng_ust_' / 'LTTNG_UST_' and add compat macros to keep
compatibility with the previous API.

Change-Id: Ifa379bae616d4c3e6f5a7e99fe436639b65f12ea
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
index 5acba5114c2520d7b2fd98e16a4c11f33b0c7590..a248b7d743d37ca7dd765e226ce5f161d63f5812 100644 (file)
--- a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
+++ b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
@@ -21,7 +21,7 @@ TRACEPOINT_EVENT(
        LTTNG_UST_TP_ARGS(
                const char *, query_name
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(query_name, query_name)
        )
 )
@@ -32,7 +32,7 @@ TRACEPOINT_EVENT(
        LTTNG_UST_TP_ARGS(
                const char *, alignment
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(alignment, alignment)
        )
 )

diff --git a/doc/examples/demo/ust_tests_demo.h b/doc/examples/demo/ust_tests_demo.h
index 8d0f06dd526dc24dff7004b8d5ef7d6b66f0b2fd..a7a8158d46aa3ca625003004398c0af5379eb742 100644 (file)
--- a/doc/examples/demo/ust_tests_demo.h
+++ b/doc/examples/demo/ust_tests_demo.h
@@ -14,7 +14,7 @@
 
 TRACEPOINT_EVENT(ust_tests_demo, starting,
        LTTNG_UST_TP_ARGS(int, value),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, value, value)
        )
 )
@@ -29,7 +29,7 @@ TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, starting,
 
 TRACEPOINT_EVENT(ust_tests_demo, done,
        LTTNG_UST_TP_ARGS(int, value),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, value, value)
        )
 )

diff --git a/doc/examples/demo/ust_tests_demo2.h b/doc/examples/demo/ust_tests_demo2.h
index 9ff9183274d3f4d3835abe33a4673092b8fe1180..fadb1e4e2d6e9fb4474794d3349a80426cf3bd04 100644 (file)
--- a/doc/examples/demo/ust_tests_demo2.h
+++ b/doc/examples/demo/ust_tests_demo2.h
@@ -17,7 +17,7 @@ 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),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, intfield, anint)
                ctf_integer_hex(int, intfield2, anint)
                ctf_integer(long, longfield, anint)

diff --git a/doc/examples/demo/ust_tests_demo3.h b/doc/examples/demo/ust_tests_demo3.h
index f922a44516a335e0f97d3b7c6b5d245f853ef975..26284c4be3709068bf03253d63771f4be5e5e730 100644 (file)
--- a/doc/examples/demo/ust_tests_demo3.h
+++ b/doc/examples/demo/ust_tests_demo3.h
@@ -14,7 +14,7 @@
 
 TRACEPOINT_EVENT(ust_tests_demo3, done,
        LTTNG_UST_TP_ARGS(int, value),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, value, value)
        )
 )

diff --git a/doc/examples/easy-ust/sample_component_provider.h b/doc/examples/easy-ust/sample_component_provider.h
index 9aa85f5282d93454f7048dc71bcb381f4ac5b62c..ae29e0ec69d77502221595b6a8b337770be51252 100644 (file)
--- a/doc/examples/easy-ust/sample_component_provider.h
+++ b/doc/examples/easy-ust/sample_component_provider.h
@@ -76,10 +76,10 @@ TRACEPOINT_EVENT(
         */
        LTTNG_UST_TP_ARGS(const char *, text),
        /*
-        * TP_FIELDS describes how to write the fields of the trace event.
+        * LTTNG_UST_TP_FIELDS describes how to write the fields of the trace event.
         * You can use the args here
         */
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
        /*
         * The ctf_string macro takes a c string and writes it into a field
         * named "message"

diff --git a/doc/examples/gen-tp/sample_tracepoint.tp b/doc/examples/gen-tp/sample_tracepoint.tp
index a5e48d58a7eeffcbc428dc76ae4a97dc9c000836..5d23f5548bb9ea362565cacc2642e6cf494f73b3 100644 (file)
--- a/doc/examples/gen-tp/sample_tracepoint.tp
+++ b/doc/examples/gen-tp/sample_tracepoint.tp
@@ -2,7 +2,7 @@ TRACEPOINT_EVENT(
        sample_tracepoint,
        message, // C++ Style comment
        LTTNG_UST_TP_ARGS(const char *, text),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(message, text)
                  )
 )

diff --git a/doc/examples/hello-static-lib/ust_tests_hello.h b/doc/examples/hello-static-lib/ust_tests_hello.h
index f4fe4b7d5fc4f7978fa6a726112726f3b5f3eab2..e3965ba161a898c05bfc2929b9ee658efc5412fb 100644 (file)
--- a/doc/examples/hello-static-lib/ust_tests_hello.h
+++ b/doc/examples/hello-static-lib/ust_tests_hello.h
@@ -17,7 +17,7 @@ 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),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, intfield, anint)
                ctf_integer_hex(int, intfield2, anint)
                ctf_integer(long, longfield, anint)
@@ -37,7 +37,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */

diff --git a/include/lttng/tp/lttng-ust-tracef.h b/include/lttng/tp/lttng-ust-tracef.h
index 95fb60db91cd769ff9769252b265b8474bca2954..b99f53155219723cc35c5ab08a6d6e293480b708 100644 (file)
--- a/include/lttng/tp/lttng-ust-tracef.h
+++ b/include/lttng/tp/lttng-ust-tracef.h
@@ -9,7 +9,7 @@
 
 TRACEPOINT_EVENT(lttng_ust_tracef, event,
        LTTNG_UST_TP_ARGS(const char *, msg, unsigned int, len, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_sequence_text(char, msg, msg, unsigned int, len)
                ctf_unused(ip)
        )

diff --git a/include/lttng/tp/lttng-ust-tracelog.h b/include/lttng/tp/lttng-ust-tracelog.h
index 1a85be3017f14287647a4c733319bf7bf1ceff7a..4665f9ac86024227bc6256e3d4ad902b08032f8a 100644 (file)
--- a/include/lttng/tp/lttng-ust-tracelog.h
+++ b/include/lttng/tp/lttng-ust-tracelog.h
@@ -10,7 +10,7 @@
 TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
        LTTNG_UST_TP_ARGS(const char *, file, int, line, const char *, func,
                const char *, msg, unsigned int, len, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, line, line)
                ctf_string(file, file)
                ctf_string(func, func)

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 269bb2b23ecc8e369a7da1167b34e143ab621572..aa07fdea84c30ecf5642df254ead41511ea5b65a 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -573,6 +573,7 @@ __tracepoints__ptrs_destroy(void)
 #define do_tracepoint                  lttng_ust_do_tracepoint
 #define tracepoint_enabled             lttng_ust_tracepoint_enabled
 #define TP_ARGS                                LTTNG_UST_TP_ARGS
+#define TP_FIELDS                      LTTNG_UST_TP_FIELDS
 #endif /* #if LTTNG_UST_COMPAT_API(0) */
 
 #ifdef __cplusplus
@@ -641,9 +642,9 @@ __tracepoints__ptrs_destroy(void)
  *     LTTNG_UST_TP_ARGS(int, arg0, void *, arg1, char *, string, size_t, strlen,
  *             long *, arg4, size_t, arg4_len),
  *
- *     * TP_FIELDS describes the event payload layout in the trace *
+ *     * LTTNG_UST_TP_FIELDS describes the event payload layout in the trace *
  *
- *     TP_FIELDS(
+ *     LTTNG_UST_TP_FIELDS(
  *         * Integer, printed in base 10 *
  *         ctf_integer(int, field_a, arg0)
  *

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index 5c11bebb894a45506d2b38943e855f985fc30eec..73b3a5ee06925d38ea0a5d6ffb1836f2bfcc44f7 100644 (file)
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -18,8 +18,8 @@
 #undef LTTNG_UST_TP_ARGS
 #define LTTNG_UST_TP_ARGS(...)
 
-#undef TP_FIELDS
-#define TP_FIELDS(...)
+#undef LTTNG_UST_TP_FIELDS
+#define LTTNG_UST_TP_FIELDS(...)
 
 #undef  TRACEPOINT_LOGLEVEL_ENUM
 #define TRACEPOINT_LOGLEVEL_ENUM(...)

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index ae13b18c1f774a98945fc59c1e9606356175135e..d0d7a4c254b285fdee4fde656b26cb5a024e56e9 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -231,8 +231,8 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
                        _elem_type_base)                        \
        lttng_ust_ctf_array_element_type_is_supported(_type, _item);
 
-#undef TP_FIELDS
-#define TP_FIELDS(...) __VA_ARGS__     /* Only one used in this phase */
+#undef LTTNG_UST_TP_FIELDS
+#define LTTNG_UST_TP_FIELDS(...) __VA_ARGS__   /* Only one used in this phase */
 
 #undef _TRACEPOINT_EVENT_CLASS
 #define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)      \
@@ -357,8 +357,8 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
                .nofilter = 0,                                  \
        }),
 
-#undef TP_FIELDS
-#define TP_FIELDS(...) __VA_ARGS__     /* Only one used in this phase */
+#undef LTTNG_UST_TP_FIELDS
+#define LTTNG_UST_TP_FIELDS(...) __VA_ARGS__   /* Only one used in this phase */
 
 #undef _TRACEPOINT_EVENT_CLASS
 #define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)                           \
@@ -457,8 +457,8 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
 #undef LTTNG_UST_TP_ARGS
 #define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
-#undef TP_FIELDS
-#define TP_FIELDS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_FIELDS
+#define LTTNG_UST_TP_FIELDS(...) __VA_ARGS__
 
 #undef _TRACEPOINT_EVENT_CLASS
 #define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)            \
@@ -626,8 +626,8 @@ size_t __event_get_size__##_provider##___##_name(                         \
 #undef LTTNG_UST_TP_ARGS
 #define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
-#undef TP_FIELDS
-#define TP_FIELDS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_FIELDS
+#define LTTNG_UST_TP_FIELDS(...) __VA_ARGS__
 
 #undef _TRACEPOINT_EVENT_CLASS
 #define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)            \
@@ -701,8 +701,8 @@ void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_da
 #undef LTTNG_UST_TP_ARGS
 #define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
-#undef TP_FIELDS
-#define TP_FIELDS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_FIELDS
+#define LTTNG_UST_TP_FIELDS(...) __VA_ARGS__
 
 #undef _TRACEPOINT_EVENT_CLASS
 #define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)            \
@@ -789,8 +789,8 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 #undef LTTNG_UST_TP_ARGS
 #define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
-#undef TP_FIELDS
-#define TP_FIELDS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_FIELDS
+#define LTTNG_UST_TP_FIELDS(...) __VA_ARGS__
 
 /*
  * For state dump, check that "session" argument (mandatory) matches the

diff --git a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h
index 37b97a119957de75dfc651bc864135f13b97dc6a..39ce675ec2562a091f0aedda6059bf83794d0466 100644 (file)
--- a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h
+++ b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h
@@ -18,7 +18,7 @@ extern "C" {
 
 TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_entry,
        LTTNG_UST_TP_ARGS(void *, func_addr),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(unsigned long, addr,
                        (unsigned long) func_addr)
        )
@@ -29,7 +29,7 @@ TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile_fast, func_entry,
 
 TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_exit,
        LTTNG_UST_TP_ARGS(void *, func_addr),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(func_addr)
        )
 )

diff --git a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h
index 63b2ac3ce5b5f422151daa5a276c27ae7ef62546..e5451c323cb847912c35cf5f02d7311c1de10a1e 100644 (file)
--- a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h
+++ b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h
@@ -18,7 +18,7 @@ extern "C" {
 
 TRACEPOINT_EVENT_CLASS(lttng_ust_cyg_profile, func_class,
        LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(unsigned long, addr,
                        (unsigned long) func_addr)
                ctf_integer_hex(unsigned long, call_site,

diff --git a/src/lib/lttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h
index b18f432c50fed14539b6b195f039892e4bc276d8..01c32ddc74877a9b85352a0da88065b48b75abbd 100644 (file)
--- a/src/lib/lttng-ust-dl/ust_dl.h
+++ b/src/lib/lttng-ust-dl/ust_dl.h
@@ -26,7 +26,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
        LTTNG_UST_TP_ARGS(void *, ip, void *, baddr, const char *, path,
                int, flags, uint64_t, memsz, uint8_t, has_build_id,
                uint8_t, has_debug_link),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_integer(uint64_t, memsz, memsz)
@@ -43,7 +43,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
                const char *, path, int, flags,
                uint64_t, memsz, uint8_t, has_build_id,
                uint8_t, has_debug_link),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_integer(uint64_t, memsz, memsz)
@@ -63,7 +63,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, build_id,
                uint8_t *, build_id,
                size_t, build_id_len
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_sequence_hex(uint8_t, build_id, build_id,
@@ -78,7 +78,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
                char *, filename,
                uint32_t, crc
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_integer(uint32_t, crc, crc)
@@ -88,7 +88,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
 
 TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
        LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
        )

diff --git a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h
index 5b48eedbb9277911d5af2ce2433ed346604e450f..398c14d459105054e79ea8ba098792b23cd1a1ab 100644 (file)
--- a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h
+++ b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h
@@ -24,7 +24,7 @@ TRACEPOINT_EVENT(lttng_jul, event,
                long, millis,
                int, log_level,
                int, thread_id),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(msg, msg)
                ctf_string(logger_name, logger_name)
                ctf_string(class_name, class_name)

diff --git a/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
index b06a44a64f7273cba302629cdff5a0a1733d81e2..25c7647db3f3d73145ace5b7a34f8f18670f3d5b 100644 (file)
--- a/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
+++ b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
@@ -26,7 +26,7 @@ TRACEPOINT_EVENT(lttng_log4j, event,
                long, timestamp,
                int, log_level,
                const char *, thread_name),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(msg, msg)
                ctf_string(logger_name, logger_name)
                ctf_string(class_name, class_name)

diff --git a/src/lib/lttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h
index 847260c5ba43caf12ec056bce7d8ab9c0429c825..887220681c2bdf05634dba2a00d5e3bcb390d2c7 100644 (file)
--- a/src/lib/lttng-ust-java/lttng_ust_java.h
+++ b/src/lib/lttng-ust-java/lttng_ust_java.h
@@ -14,7 +14,7 @@
 
 TRACEPOINT_EVENT(lttng_ust_java, int_event,
        LTTNG_UST_TP_ARGS(const char *, name, int, payload),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)
                ctf_integer(int, int_payload, payload)
        )
@@ -22,7 +22,7 @@ TRACEPOINT_EVENT(lttng_ust_java, int_event,
 
 TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
        LTTNG_UST_TP_ARGS(const char *, name, int, payload1, int, payload2),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)
                ctf_integer(int, int_payload1, payload1)
                ctf_integer(int, int_payload2, payload2)
@@ -31,7 +31,7 @@ TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
 
 TRACEPOINT_EVENT(lttng_ust_java, long_event,
        LTTNG_UST_TP_ARGS(const char *, name, long, payload),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)
                ctf_integer(long, long_payload, payload)
        )
@@ -39,7 +39,7 @@ TRACEPOINT_EVENT(lttng_ust_java, long_event,
 
 TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
        LTTNG_UST_TP_ARGS(const char *, name, long, payload1, long, payload2),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)
                ctf_integer(long, long_payload1, payload1)
                ctf_integer(long, long_payload2, payload2)
@@ -48,7 +48,7 @@ TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
 
 TRACEPOINT_EVENT(lttng_ust_java, string_event,
        LTTNG_UST_TP_ARGS(const char *, name, const char *, payload),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)
                ctf_string(string_payload, payload)
        )

diff --git a/src/lib/lttng-ust-libc-wrapper/ust_libc.h b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
index c4e7e4bf58c4d849be81fb420cabeb69a201725f..5008ce8d761bd0b29a043e1bdc05bbea4a987eb4 100644 (file)
--- a/src/lib/lttng-ust-libc-wrapper/ust_libc.h
+++ b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
@@ -18,7 +18,7 @@ extern "C" {
 
 TRACEPOINT_EVENT(lttng_ust_libc, malloc,
        LTTNG_UST_TP_ARGS(size_t, size, void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(size_t, size, size)
                ctf_integer_hex(void *, ptr, ptr)
                ctf_unused(ip)
@@ -27,7 +27,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, malloc,
 
 TRACEPOINT_EVENT(lttng_ust_libc, free,
        LTTNG_UST_TP_ARGS(void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, ptr, ptr)
                ctf_unused(ip)
        )
@@ -35,7 +35,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, free,
 
 TRACEPOINT_EVENT(lttng_ust_libc, calloc,
        LTTNG_UST_TP_ARGS(size_t, nmemb, size_t, size, void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(size_t, nmemb, nmemb)
                ctf_integer(size_t, size, size)
                ctf_integer_hex(void *, ptr, ptr)
@@ -45,7 +45,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, calloc,
 
 TRACEPOINT_EVENT(lttng_ust_libc, realloc,
        LTTNG_UST_TP_ARGS(void *, in_ptr, size_t, size, void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, in_ptr, in_ptr)
                ctf_integer(size_t, size, size)
                ctf_integer_hex(void *, ptr, ptr)
@@ -55,7 +55,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, realloc,
 
 TRACEPOINT_EVENT(lttng_ust_libc, memalign,
        LTTNG_UST_TP_ARGS(size_t, alignment, size_t, size, void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(size_t, alignment, alignment)
                ctf_integer(size_t, size, size)
                ctf_integer_hex(void *, ptr, ptr)
@@ -65,7 +65,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, memalign,
 
 TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
        LTTNG_UST_TP_ARGS(void *, out_ptr, size_t, alignment, size_t, size, int, result, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, out_ptr, out_ptr)
                ctf_integer(size_t, alignment, alignment)
                ctf_integer(size_t, size, size)

diff --git a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
index 1fe3cf10c38850b969181778aca4546e57e2607f..d22eab2e0555ea1d3ceaac1b84bf8d8eb912dad5 100644 (file)
--- a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
+++ b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
@@ -18,7 +18,7 @@ extern "C" {
 
 TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
                ctf_unused(ip)
        )
@@ -26,7 +26,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
 
 TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
                ctf_integer(int, status, status)
                ctf_unused(ip)
@@ -35,7 +35,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
 
 TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
                ctf_integer(int, status, status)
                ctf_unused(ip)
@@ -44,7 +44,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
 
 TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
                ctf_integer(int, status, status)
                ctf_unused(ip)

diff --git a/src/lib/lttng-ust-python-agent/lttng_ust_python.h b/src/lib/lttng-ust-python-agent/lttng_ust_python.h
index c1eae70be99931f5d72d6cf8669b856b9edd675c..d2f4ef56f1af1ac2255fafa5ea50a3a84778ebae 100644 (file)
--- a/src/lib/lttng-ust-python-agent/lttng_ust_python.h
+++ b/src/lib/lttng-ust-python-agent/lttng_ust_python.h
@@ -24,7 +24,7 @@ TRACEPOINT_EVENT(lttng_python, event,
                int, thread,
                const char *, threadName
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(asctime, asctime)
                ctf_string(msg, msg)
                ctf_string(logger_name, logger_name)

diff --git a/src/lib/lttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
index 012852dbea056309f62b3ecfd2c1ab17028b26f8..e1a2ed78c449b7dfa0b82953ad2c52f26dc198fd 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-statedump-provider.h
+++ b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
@@ -25,7 +25,7 @@ extern "C" {
 
 TRACEPOINT_EVENT(lttng_ust_statedump, start,
        LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(session)
        )
 )
@@ -40,7 +40,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
                uint8_t, has_build_id,
                uint8_t, has_debug_link
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(session)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_integer(uint64_t, memsz, memsz)
@@ -58,7 +58,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
                uint8_t *, build_id,
                size_t, build_id_len
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(session)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_sequence_hex(uint8_t, build_id, build_id,
@@ -73,7 +73,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
                char *, filename,
                uint32_t, crc
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(session)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_integer(uint32_t, crc, crc)
@@ -86,7 +86,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, procname,
                struct lttng_ust_session *, session,
                char *, name
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(session)
                ctf_array_text(char, procname, name, LTTNG_UST_ABI_PROCNAME_LEN)
        )
@@ -94,7 +94,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, procname,
 
 TRACEPOINT_EVENT(lttng_ust_statedump, end,
        LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(session)
        )
 )

diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h
index 4404fb84d9fdd8920bed29d65dfa7e088ed5902a..3f9e208c03745a5d4d333a885631f23e821a1e01 100644 (file)
--- a/src/lib/lttng-ust/ust_lib.h
+++ b/src/lib/lttng-ust/ust_lib.h
@@ -27,7 +27,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, load,
        LTTNG_UST_TP_ARGS(void *, ip, void *, baddr, const char*, path,
                uint64_t, memsz, uint8_t, has_build_id,
                uint8_t, has_debug_link),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_integer(uint64_t, memsz, memsz)
@@ -44,7 +44,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, build_id,
                uint8_t *, build_id,
                size_t, build_id_len
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_sequence_hex(uint8_t, build_id, build_id,
@@ -59,7 +59,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
                char *, filename,
                uint32_t, crc
        ),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_integer(uint32_t, crc, crc)
@@ -69,7 +69,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
 
 TRACEPOINT_EVENT(lttng_ust_lib, unload,
        LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
        )

diff --git a/tests/benchmark/ust_tests_benchmark.h b/tests/benchmark/ust_tests_benchmark.h
index b24ace331d9663c883f4af607918c552a91f8b78..522564dd02bfcca1aeadff3761da2438551397ad 100644 (file)
--- a/tests/benchmark/ust_tests_benchmark.h
+++ b/tests/benchmark/ust_tests_benchmark.h
@@ -14,7 +14,7 @@
 
 TRACEPOINT_EVENT(ust_tests_benchmark, tpbench,
        LTTNG_UST_TP_ARGS(int, value),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, event, value)
        )
 )

diff --git a/tests/compile/ctf-types/ust_tests_ctf_types.h b/tests/compile/ctf-types/ust_tests_ctf_types.h
index 324d74d9b7fb54bc2f92690d35111807460f22b7..c9f667b84f0129b9c1fe3e09837ee922aa4cd8f0 100644 (file)
--- a/tests/compile/ctf-types/ust_tests_ctf_types.h
+++ b/tests/compile/ctf-types/ust_tests_ctf_types.h
@@ -35,7 +35,7 @@ TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
  */
 TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
        LTTNG_UST_TP_ARGS(int, anint, int, enumval, int, enumval2),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, intfield, anint)
                ctf_enum(ust_tests_ctf_types, testenum, int, enumfield, enumval)
                ctf_enum(ust_tests_ctf_types, testenum, long long,
@@ -51,7 +51,7 @@ TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
  */
 TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
        LTTNG_UST_TP_ARGS(int, anint, int, enumval),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, intfield, anint)
                ctf_enum(ust_tests_ctf_types, testenum, unsigned char,
                        enumfield, enumval)

diff --git a/tests/compile/hello-many/ust_tests_hello_many.h b/tests/compile/hello-many/ust_tests_hello_many.h
index 9d89df72130cbd47e20617fc9d168df1e64e8c06..bd2a55958cd03c74090c8312e78602f51264aac6 100644 (file)
--- a/tests/compile/hello-many/ust_tests_hello_many.h
+++ b/tests/compile/hello-many/ust_tests_hello_many.h
@@ -15,203 +15,203 @@
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple1,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple2,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple3,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple4,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple5,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple6,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple7,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple8,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple9,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple10,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple11,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple12,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple13,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple14,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple15,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple16,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple17,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple18,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple19,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple20,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple21,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple22,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple23,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple24,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple25,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple26,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple27,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple28,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple29,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple30,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple31,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple32,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple33,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple34,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple35,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple36,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple37,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple38,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple39,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple40,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_MANY_H */

diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h
index 1e3f2f8ec2fcfe4e6caa3592e0ea437f44681720..6da2c4dfe735bd496f6ee8d733d9cae53b2cd4ef 100644 (file)
--- a/tests/compile/hello.cxx/ust_tests_hello.h
+++ b/tests/compile/hello.cxx/ust_tests_hello.h
@@ -29,7 +29,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
                 char *, text, size_t, textlen,
                 double, doublearg, float, floatarg,
                 int, enumarg),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, intfield, anint)
                ctf_integer_hex(int, intfield2, anint)
                ctf_integer(long, longfield, anint)
@@ -50,7 +50,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */

diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h
index c717a4c87cfdc365a9cd6094498836e81ee8cca7..17c2051709bd3a63a888aacf20a9c1c1a5e027f8 100644 (file)
--- a/tests/compile/hello/ust_tests_hello.h
+++ b/tests/compile/hello/ust_tests_hello.h
@@ -19,7 +19,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
                char *, text, size_t, textlen,
                double, doublearg, float, floatarg,
                bool, boolarg),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, intfield, anint)
                ctf_integer_hex(int, intfield2, anint)
                ctf_integer(long, longfield, anint)
@@ -52,7 +52,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */

diff --git a/tests/compile/same_line_tracepoint/ust_tests_sameline.h b/tests/compile/same_line_tracepoint/ust_tests_sameline.h
index 565f74f6ef110bf48cc1e8a5276a81201de6203e..5f0ee954bc14ee059f4ed42f95e9bc13ee37efaf 100644 (file)
--- a/tests/compile/same_line_tracepoint/ust_tests_sameline.h
+++ b/tests/compile/same_line_tracepoint/ust_tests_sameline.h
@@ -14,13 +14,13 @@
 
 TRACEPOINT_EVENT(ust_tests_sameline, event1,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 TRACEPOINT_LOGLEVEL(ust_tests_sameline, event1, TRACE_CRIT)
 
 TRACEPOINT_EVENT(ust_tests_sameline, event2,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 TRACEPOINT_LOGLEVEL(ust_tests_sameline, event2, TRACE_CRIT)
 

diff --git a/tests/compile/test-app-ctx/ust_tests_hello.h b/tests/compile/test-app-ctx/ust_tests_hello.h
index 006b8a1e96190dca9ae67f44cd04972ee50212a9..07051e12e3591d136c41ce3d505d48db2d925f48 100644 (file)
--- a/tests/compile/test-app-ctx/ust_tests_hello.h
+++ b/tests/compile/test-app-ctx/ust_tests_hello.h
@@ -19,7 +19,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
                char *, text, size_t, textlen,
                double, doublearg, float, floatarg,
                bool, boolarg),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(int, intfield, anint)
                ctf_integer_hex(int, intfield2, anint)
                ctf_integer(long, longfield, anint)
@@ -41,7 +41,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
        LTTNG_UST_TP_ARGS(),
-       TP_FIELDS()
+       LTTNG_UST_TP_FIELDS()
 )
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */