Tracepoint API namespacing 'TP_ARGS'

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: Id0a63bc4cf96ac2980690fae0e6b22fdf17a4fc1
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 40ff1f53ec531895b1ecf84b923ef6a8eea7d08f..5acba5114c2520d7b2fd98e16a4c11f33b0c7590 100644 (file)
--- a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
+++ b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
@@ -18,7 +18,7 @@
 TRACEPOINT_EVENT(
        TRACEPOINT_PROVIDER,
        align_query,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                const char *, query_name
        ),
        TP_FIELDS(
@@ -29,7 +29,7 @@ TRACEPOINT_EVENT(
 TRACEPOINT_EVENT(
        TRACEPOINT_PROVIDER,
        test_alignment,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                const char *, alignment
        ),
        TP_FIELDS(

diff --git a/doc/examples/demo/ust_tests_demo.h b/doc/examples/demo/ust_tests_demo.h
index 69fde8a7d165d905b177f98a446ab57684683b53..8d0f06dd526dc24dff7004b8d5ef7d6b66f0b2fd 100644 (file)
--- a/doc/examples/demo/ust_tests_demo.h
+++ b/doc/examples/demo/ust_tests_demo.h
@@ -13,7 +13,7 @@
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(ust_tests_demo, starting,
-       TP_ARGS(int, value),
+       LTTNG_UST_TP_ARGS(int, value),
        TP_FIELDS(
                ctf_integer(int, value, value)
        )
@@ -28,7 +28,7 @@ TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, starting,
        "http://example.com/path_to_model?q=ust_tests_demo:starting")
 
 TRACEPOINT_EVENT(ust_tests_demo, done,
-       TP_ARGS(int, value),
+       LTTNG_UST_TP_ARGS(int, value),
        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 7f3d878dd9ab94125a3fe9b8a97ec9bea00277f9..9ff9183274d3f4d3835abe33a4673092b8fe1180 100644 (file)
--- a/doc/examples/demo/ust_tests_demo2.h
+++ b/doc/examples/demo/ust_tests_demo2.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 
 TRACEPOINT_EVENT(ust_tests_demo2, loop,
-       TP_ARGS(int, anint, int, netint, long *, values,
+       LTTNG_UST_TP_ARGS(int, anint, int, netint, long *, values,
                 char *, text, size_t, textlen,
                 double, doublearg, float, floatarg),
        TP_FIELDS(

diff --git a/doc/examples/demo/ust_tests_demo3.h b/doc/examples/demo/ust_tests_demo3.h
index 01d4c36f30c904d4cc5bc3f10da2ef70165f554f..f922a44516a335e0f97d3b7c6b5d245f853ef975 100644 (file)
--- a/doc/examples/demo/ust_tests_demo3.h
+++ b/doc/examples/demo/ust_tests_demo3.h
@@ -13,7 +13,7 @@
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(ust_tests_demo3, done,
-       TP_ARGS(int, value),
+       LTTNG_UST_TP_ARGS(int, value),
        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 d457664d8aa1fa9c9daf3750a816a7027b003612..9aa85f5282d93454f7048dc71bcb381f4ac5b62c 100644 (file)
--- a/doc/examples/easy-ust/sample_component_provider.h
+++ b/doc/examples/easy-ust/sample_component_provider.h
@@ -65,16 +65,16 @@ TRACEPOINT_EVENT(
         */
        message,
        /*
-        * TP_ARGS macro contains the arguments passed for the tracepoint
+        * LTTNG_UST_TP_ARGS macro contains the arguments passed for the tracepoint
         * it is in the following format
-        *              TP_ARGS( type1, name1, type2, name2, ... type10, name10)
+        *              LTTNG_UST_TP_ARGS( type1, name1, type2, name2, ... type10, name10)
         * where there can be from zero to ten elements.
         * typeN is the datatype, such as int, struct or double **.
         * name is the variable name (in "int myInt" the name would be myint)
-        *              TP_ARGS() is valid to mean no arguments
-        *              TP_ARGS( void ) is valid too
+        *              LTTNG_UST_TP_ARGS() is valid to mean no arguments
+        *              LTTNG_UST_TP_ARGS( void ) is valid too
         */
-       TP_ARGS(const char *, text),
+       LTTNG_UST_TP_ARGS(const char *, text),
        /*
         * TP_FIELDS describes how to write the fields of the trace event.
         * You can use the args here

diff --git a/doc/examples/gen-tp/sample_tracepoint.tp b/doc/examples/gen-tp/sample_tracepoint.tp
index 22f7713f972a7c1d7ca7dc4f04ef8e7ee8aae523..a5e48d58a7eeffcbc428dc76ae4a97dc9c000836 100644 (file)
--- a/doc/examples/gen-tp/sample_tracepoint.tp
+++ b/doc/examples/gen-tp/sample_tracepoint.tp
@@ -1,7 +1,7 @@
 TRACEPOINT_EVENT(
        sample_tracepoint,
        message, // C++ Style comment
-       TP_ARGS(const char *, text),
+       LTTNG_UST_TP_ARGS(const char *, text),
        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 4b935963ec0f3ca33af67eec366b8b95452ab371..f4fe4b7d5fc4f7978fa6a726112726f3b5f3eab2 100644 (file)
--- a/doc/examples/hello-static-lib/ust_tests_hello.h
+++ b/doc/examples/hello-static-lib/ust_tests_hello.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest,
-       TP_ARGS(int, anint, int, netint, long *, values,
+       LTTNG_UST_TP_ARGS(int, anint, int, netint, long *, values,
                 char *, text, size_t, textlen,
                 double, doublearg, float, floatarg),
        TP_FIELDS(
@@ -36,7 +36,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
 )
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
-       TP_ARGS(),
+       LTTNG_UST_TP_ARGS(),
        TP_FIELDS()
 )
 

diff --git a/include/lttng/tp/lttng-ust-tracef.h b/include/lttng/tp/lttng-ust-tracef.h
index 4feeb6940712ad5d2b97023fc11a4d1b2bf19c83..95fb60db91cd769ff9769252b265b8474bca2954 100644 (file)
--- a/include/lttng/tp/lttng-ust-tracef.h
+++ b/include/lttng/tp/lttng-ust-tracef.h
@@ -8,7 +8,7 @@
 #include <stdarg.h>
 
 TRACEPOINT_EVENT(lttng_ust_tracef, event,
-       TP_ARGS(const char *, msg, unsigned int, len, void *, ip),
+       LTTNG_UST_TP_ARGS(const char *, msg, unsigned int, len, void *, ip),
        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 95564707aa37db14da0ec721426034cefa3b0990..1a85be3017f14287647a4c733319bf7bf1ceff7a 100644 (file)
--- a/include/lttng/tp/lttng-ust-tracelog.h
+++ b/include/lttng/tp/lttng-ust-tracelog.h
@@ -8,7 +8,7 @@
 #include <stdarg.h>
 
 TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
-       TP_ARGS(const char *, file, int, line, const char *, func,
+       LTTNG_UST_TP_ARGS(const char *, file, int, line, const char *, func,
                const char *, msg, unsigned int, len, void *, ip),
        TP_FIELDS(
                ctf_integer(int, line, line)
@@ -21,7 +21,7 @@ TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
 
 #define TP_TRACELOG_TEMPLATE(_level_enum) \
        TRACEPOINT_EVENT_INSTANCE(lttng_ust_tracelog, tlclass, _level_enum, \
-               TP_ARGS(const char *, file, int, line, const char *, func, \
+               LTTNG_UST_TP_ARGS(const char *, file, int, line, const char *, func, \
                        const char *, msg, unsigned int, len, void *, ip) \
        ) \
        TRACEPOINT_LOGLEVEL(lttng_ust_tracelog, _level_enum, _level_enum)

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 2cef17a4a944386d3f1c424367654d2cba73e11e..85b4ffa67e7d02bd60066397a93c6c7cd5cf1386 100644 (file)
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -37,8 +37,8 @@
  * Put back definitions to the state they were when defined by
  * tracepoint.h.
  */
-#undef TP_ARGS
-#define TP_ARGS(...)       __VA_ARGS__
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...)       __VA_ARGS__
 
 #undef TRACEPOINT_EVENT
 #define TRACEPOINT_EVENT(provider, name, args, fields)                 \

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 96e0160552658b3a7c26e4eb6634a77c17c588a3..269bb2b23ecc8e369a7da1167b34e143ab621572 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -63,10 +63,10 @@ extern "C" {
                        lttng_ust_do_tracepoint(provider, name, __VA_ARGS__);   \
        } while (0)
 
-#define TP_ARGS(...)       __VA_ARGS__
+#define LTTNG_UST_TP_ARGS(...)       __VA_ARGS__
 
 /*
- * TP_ARGS takes tuples of type, argument separated by a comma.
+ * LTTNG_UST_TP_ARGS takes tuples of type, argument separated by a comma.
  * It can take up to 10 tuples (which means that less than 10 tuples is
  * fine too).
  * Each tuple is also separated by a comma.
@@ -572,6 +572,7 @@ __tracepoints__ptrs_destroy(void)
 #define tracepoint                     lttng_ust_tracepoint
 #define do_tracepoint                  lttng_ust_do_tracepoint
 #define tracepoint_enabled             lttng_ust_tracepoint_enabled
+#define TP_ARGS                                LTTNG_UST_TP_ARGS
 #endif /* #if LTTNG_UST_COMPAT_API(0) */
 
 #ifdef __cplusplus
@@ -635,9 +636,9 @@ __tracepoints__ptrs_destroy(void)
  *
  * TRACEPOINT_EVENT(someproject_component, event_name,
  *
- *     * TP_ARGS takes from 0 to 10 "type, field_name" pairs *
+ *     * LTTNG_UST_TP_ARGS takes from 0 to 10 "type, field_name" pairs *
  *
- *     TP_ARGS(int, arg0, void *, arg1, char *, string, size_t, strlen,
+ *     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 *

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index d42213d17418c08d99a0051e6e36a358a9f51829..5c11bebb894a45506d2b38943e855f985fc30eec 100644 (file)
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -15,8 +15,8 @@
 #undef TRACEPOINT_ENUM
 #define TRACEPOINT_ENUM(_provider, _name, _values)
 
-#undef TP_ARGS
-#define TP_ARGS(...)
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...)
 
 #undef TP_FIELDS
 #define TP_FIELDS(...)

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index e663e839bc0e5426b643dfce5f4f93e17ca57b8b..ae13b18c1f774a98945fc59c1e9606356175135e 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -124,8 +124,8 @@ void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void)
 /* Reset all macros within TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
-#undef TP_ARGS
-#define TP_ARGS(...)   __VA_ARGS__
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
 #undef _TRACEPOINT_EVENT_INSTANCE
 #define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
@@ -387,8 +387,8 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
 /* Reset all macros within TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
-#undef TP_ARGS
-#define TP_ARGS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
 #undef _TRACEPOINT_EVENT_CLASS
 #define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)              \
@@ -454,8 +454,8 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
 #define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)              \
        _ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, _nowrite)
 
-#undef TP_ARGS
-#define TP_ARGS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
 #undef TP_FIELDS
 #define TP_FIELDS(...) __VA_ARGS__
@@ -623,8 +623,8 @@ size_t __event_get_size__##_provider##___##_name(                         \
 #define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)              \
        _ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, _nowrite)
 
-#undef TP_ARGS
-#define TP_ARGS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
 #undef TP_FIELDS
 #define TP_FIELDS(...) __VA_ARGS__
@@ -698,8 +698,8 @@ void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_da
 #define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)              \
        _ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, _nowrite)
 
-#undef TP_ARGS
-#define TP_ARGS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
 #undef TP_FIELDS
 #define TP_FIELDS(...) __VA_ARGS__
@@ -786,8 +786,8 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 #undef __get_dynamic_len
 #define __get_dynamic_len(field)       __stackvar.__dynamic_len[__dynamic_len_idx++]
 
-#undef TP_ARGS
-#define TP_ARGS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
 #undef TP_FIELDS
 #define TP_FIELDS(...) __VA_ARGS__
@@ -933,8 +933,8 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))           \
 /* Reset all macros within TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
-#undef TP_ARGS
-#define TP_ARGS(...) __VA_ARGS__
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
 #define _TP_EXTRACT_STRING2(...)       #__VA_ARGS__
 

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 f2cdaabe94b32c620c82ad956b91344404bf2fd1..37b97a119957de75dfc651bc864135f13b97dc6a 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
@@ -17,7 +17,7 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_entry,
-       TP_ARGS(void *, func_addr),
+       LTTNG_UST_TP_ARGS(void *, func_addr),
        TP_FIELDS(
                ctf_integer_hex(unsigned long, addr,
                        (unsigned long) func_addr)
@@ -28,7 +28,7 @@ TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile_fast, func_entry,
        TRACE_DEBUG_FUNCTION)
 
 TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_exit,
-       TP_ARGS(void *, func_addr),
+       LTTNG_UST_TP_ARGS(void *, func_addr),
        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 8e98237a56513e3cdde0651362e45be536de3121..63b2ac3ce5b5f422151daa5a276c27ae7ef62546 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
@@ -17,7 +17,7 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT_CLASS(lttng_ust_cyg_profile, func_class,
-       TP_ARGS(void *, func_addr, void *, call_site),
+       LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site),
        TP_FIELDS(
                ctf_integer_hex(unsigned long, addr,
                        (unsigned long) func_addr)
@@ -28,7 +28,7 @@ TRACEPOINT_EVENT_CLASS(lttng_ust_cyg_profile, func_class,
 
 TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
        func_entry,
-       TP_ARGS(void *, func_addr, void *, call_site)
+       LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site)
 )
 
 TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_entry,
@@ -36,7 +36,7 @@ TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_entry,
 
 TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
        func_exit,
-       TP_ARGS(void *, func_addr, void *, call_site)
+       LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site)
 )
 
 TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_exit,

diff --git a/src/lib/lttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h
index 7f618da778518998927b856f4a02b0ca9dff0531..b18f432c50fed14539b6b195f039892e4bc276d8 100644 (file)
--- a/src/lib/lttng-ust-dl/ust_dl.h
+++ b/src/lib/lttng-ust-dl/ust_dl.h
@@ -23,7 +23,7 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
-       TP_ARGS(void *, ip, void *, baddr, const char *, path,
+       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(
@@ -39,7 +39,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
 
 #ifdef HAVE_DLMOPEN
 TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
-       TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
+       LTTNG_UST_TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
                const char *, path, int, flags,
                uint64_t, memsz, uint8_t, has_build_id,
                uint8_t, has_debug_link),
@@ -57,7 +57,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
 #endif
 
 TRACEPOINT_EVENT(lttng_ust_dl, build_id,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                void *, ip,
                void *, baddr,
                uint8_t *, build_id,
@@ -72,7 +72,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, build_id,
 )
 
 TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                void *, ip,
                void *, baddr,
                char *, filename,
@@ -87,7 +87,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
 )
 
 TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
-       TP_ARGS(void *, ip, void *, baddr),
+       LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
        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 13003bf23e23a35fbb3b9f1e74d23dd7d4fc7a46..5b48eedbb9277911d5af2ce2433ed346604e450f 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
@@ -16,7 +16,7 @@
  * Tracepoint used by Java applications using the JUL handler.
  */
 TRACEPOINT_EVENT(lttng_jul, event,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                const char *, msg,
                const char *, logger_name,
                const char *, 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 c7d7d5250eda16c5f4044dce98fe4c57f68e31af..b06a44a64f7273cba302629cdff5a0a1733d81e2 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
@@ -16,7 +16,7 @@
  * Tracepoint used by Java applications using the log4j log appender.
  */
 TRACEPOINT_EVENT(lttng_log4j, event,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                const char *, msg,
                const char *, logger_name,
                const char *, 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 ea515a84dd6e25dc3def59334c4822d67cd34a1f..847260c5ba43caf12ec056bce7d8ab9c0429c825 100644 (file)
--- a/src/lib/lttng-ust-java/lttng_ust_java.h
+++ b/src/lib/lttng-ust-java/lttng_ust_java.h
@@ -13,7 +13,7 @@
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_java, int_event,
-       TP_ARGS(const char *, name, int, payload),
+       LTTNG_UST_TP_ARGS(const char *, name, int, payload),
        TP_FIELDS(
                ctf_string(name, name)
                ctf_integer(int, int_payload, payload)
@@ -21,7 +21,7 @@ TRACEPOINT_EVENT(lttng_ust_java, int_event,
 )
 
 TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
-       TP_ARGS(const char *, name, int, payload1, int, payload2),
+       LTTNG_UST_TP_ARGS(const char *, name, int, payload1, int, payload2),
        TP_FIELDS(
                ctf_string(name, name)
                ctf_integer(int, int_payload1, payload1)
@@ -30,7 +30,7 @@ TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
 )
 
 TRACEPOINT_EVENT(lttng_ust_java, long_event,
-       TP_ARGS(const char *, name, long, payload),
+       LTTNG_UST_TP_ARGS(const char *, name, long, payload),
        TP_FIELDS(
                ctf_string(name, name)
                ctf_integer(long, long_payload, payload)
@@ -38,7 +38,7 @@ TRACEPOINT_EVENT(lttng_ust_java, long_event,
 )
 
 TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
-       TP_ARGS(const char *, name, long, payload1, long, payload2),
+       LTTNG_UST_TP_ARGS(const char *, name, long, payload1, long, payload2),
        TP_FIELDS(
                ctf_string(name, name)
                ctf_integer(long, long_payload1, payload1)
@@ -47,7 +47,7 @@ TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
 )
 
 TRACEPOINT_EVENT(lttng_ust_java, string_event,
-       TP_ARGS(const char *, name, const char *, payload),
+       LTTNG_UST_TP_ARGS(const char *, name, const char *, payload),
        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 6aaef22b60af0d464654118d0227966622430c88..c4e7e4bf58c4d849be81fb420cabeb69a201725f 100644 (file)
--- a/src/lib/lttng-ust-libc-wrapper/ust_libc.h
+++ b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
@@ -17,7 +17,7 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_libc, malloc,
-       TP_ARGS(size_t, size, void *, ptr, void *, ip),
+       LTTNG_UST_TP_ARGS(size_t, size, void *, ptr, void *, ip),
        TP_FIELDS(
                ctf_integer(size_t, size, size)
                ctf_integer_hex(void *, ptr, ptr)
@@ -26,7 +26,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, malloc,
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, free,
-       TP_ARGS(void *, ptr, void *, ip),
+       LTTNG_UST_TP_ARGS(void *, ptr, void *, ip),
        TP_FIELDS(
                ctf_integer_hex(void *, ptr, ptr)
                ctf_unused(ip)
@@ -34,7 +34,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, free,
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, calloc,
-       TP_ARGS(size_t, nmemb, size_t, size, void *, ptr, void *, ip),
+       LTTNG_UST_TP_ARGS(size_t, nmemb, size_t, size, void *, ptr, void *, ip),
        TP_FIELDS(
                ctf_integer(size_t, nmemb, nmemb)
                ctf_integer(size_t, size, size)
@@ -44,7 +44,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, calloc,
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, realloc,
-       TP_ARGS(void *, in_ptr, size_t, size, void *, ptr, void *, ip),
+       LTTNG_UST_TP_ARGS(void *, in_ptr, size_t, size, void *, ptr, void *, ip),
        TP_FIELDS(
                ctf_integer_hex(void *, in_ptr, in_ptr)
                ctf_integer(size_t, size, size)
@@ -54,7 +54,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, realloc,
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, memalign,
-       TP_ARGS(size_t, alignment, size_t, size, void *, ptr, void *, ip),
+       LTTNG_UST_TP_ARGS(size_t, alignment, size_t, size, void *, ptr, void *, ip),
        TP_FIELDS(
                ctf_integer(size_t, alignment, alignment)
                ctf_integer(size_t, size, size)
@@ -64,7 +64,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, memalign,
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
-       TP_ARGS(void *, out_ptr, size_t, alignment, size_t, size, int, result, void *, ip),
+       LTTNG_UST_TP_ARGS(void *, out_ptr, size_t, alignment, size_t, size, int, result, void *, ip),
        TP_FIELDS(
                ctf_integer_hex(void *, out_ptr, out_ptr)
                ctf_integer(size_t, alignment, alignment)

diff --git a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
index 4fdc11aa445f9d244d740d07dd6e440679a6398f..1fe3cf10c38850b969181778aca4546e57e2607f 100644 (file)
--- a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
+++ b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
@@ -17,7 +17,7 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
-       TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
+       LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
        TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
                ctf_unused(ip)
@@ -25,7 +25,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
 )
 
 TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
-       TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
+       LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
        TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
                ctf_integer(int, status, status)
@@ -34,7 +34,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
 )
 
 TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
-       TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
+       LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
        TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
                ctf_integer(int, status, status)
@@ -43,7 +43,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
 )
 
 TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
-       TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
+       LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
        TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
                ctf_integer(int, status, status)

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 29440e2aa91a783a8fda638194ee6631ac951859..c1eae70be99931f5d72d6cf8669b856b9edd675c 100644 (file)
--- a/src/lib/lttng-ust-python-agent/lttng_ust_python.h
+++ b/src/lib/lttng-ust-python-agent/lttng_ust_python.h
@@ -14,7 +14,7 @@
 #include <stdbool.h>
 
 TRACEPOINT_EVENT(lttng_python, event,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                const char *, asctime,
                const char *, msg,
                const char *, 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 c6600f349b4281614d4ccb2e5df8bc14220425f0..012852dbea056309f62b3ecfd2c1ab17028b26f8 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-statedump-provider.h
+++ b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
@@ -24,14 +24,14 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_statedump, start,
-       TP_ARGS(struct lttng_ust_session *, session),
+       LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
        TP_FIELDS(
                ctf_unused(session)
        )
 )
 
 TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                struct lttng_ust_session *, session,
                void *, baddr,
                const char*, path,
@@ -52,7 +52,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
 )
 
 TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                struct lttng_ust_session *, session,
                void *, baddr,
                uint8_t *, build_id,
@@ -67,7 +67,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
 )
 
 TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                struct lttng_ust_session *, session,
                void *, baddr,
                char *, filename,
@@ -82,7 +82,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
 )
 
 TRACEPOINT_EVENT(lttng_ust_statedump, procname,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                struct lttng_ust_session *, session,
                char *, name
        ),
@@ -93,7 +93,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, procname,
 )
 
 TRACEPOINT_EVENT(lttng_ust_statedump, end,
-       TP_ARGS(struct lttng_ust_session *, session),
+       LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
        TP_FIELDS(
                ctf_unused(session)
        )

diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h
index f704efb61d86e36822f5b62043d5042a729dfed1..4404fb84d9fdd8920bed29d65dfa7e088ed5902a 100644 (file)
--- a/src/lib/lttng-ust/ust_lib.h
+++ b/src/lib/lttng-ust/ust_lib.h
@@ -24,7 +24,7 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_lib, load,
-       TP_ARGS(void *, ip, void *, baddr, const char*, path,
+       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(
@@ -38,7 +38,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, load,
 )
 
 TRACEPOINT_EVENT(lttng_ust_lib, build_id,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                void *, ip,
                void *, baddr,
                uint8_t *, build_id,
@@ -53,7 +53,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, build_id,
 )
 
 TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
-       TP_ARGS(
+       LTTNG_UST_TP_ARGS(
                void *, ip,
                void *, baddr,
                char *, filename,
@@ -68,7 +68,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
 )
 
 TRACEPOINT_EVENT(lttng_ust_lib, unload,
-       TP_ARGS(void *, ip, void *, baddr),
+       LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
        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 d21c645edccdaf9efe7278fd9de2cf6fab02c8ec..b24ace331d9663c883f4af607918c552a91f8b78 100644 (file)
--- a/tests/benchmark/ust_tests_benchmark.h
+++ b/tests/benchmark/ust_tests_benchmark.h
@@ -13,7 +13,7 @@
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(ust_tests_benchmark, tpbench,
-       TP_ARGS(int, value),
+       LTTNG_UST_TP_ARGS(int, value),
        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 4ce4d984ae524a7febe5d77a4342482a6b7831b8..324d74d9b7fb54bc2f92690d35111807460f22b7 100644 (file)
--- a/tests/compile/ctf-types/ust_tests_ctf_types.h
+++ b/tests/compile/ctf-types/ust_tests_ctf_types.h
@@ -34,7 +34,7 @@ TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
  * is entered only once in the metadata file.
  */
 TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
-       TP_ARGS(int, anint, int, enumval, int, enumval2),
+       LTTNG_UST_TP_ARGS(int, anint, int, enumval, int, enumval2),
        TP_FIELDS(
                ctf_integer(int, intfield, anint)
                ctf_enum(ust_tests_ctf_types, testenum, int, enumfield, enumval)
@@ -50,7 +50,7 @@ TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
  * only once in the metadata file.
  */
 TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
-       TP_ARGS(int, anint, int, enumval),
+       LTTNG_UST_TP_ARGS(int, anint, int, enumval),
        TP_FIELDS(
                ctf_integer(int, intfield, anint)
                ctf_enum(ust_tests_ctf_types, testenum, unsigned char,

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

diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h
index 1963e737f4aeef2658efb767aa0158d18f08612d..1e3f2f8ec2fcfe4e6caa3592e0ea437f44681720 100644 (file)
--- a/tests/compile/hello.cxx/ust_tests_hello.h
+++ b/tests/compile/hello.cxx/ust_tests_hello.h
@@ -25,7 +25,7 @@ TRACEPOINT_ENUM(ust_tests_hello, my_enum,
 )
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest,
-       TP_ARGS(int, anint, int, netint, long *, values,
+       LTTNG_UST_TP_ARGS(int, anint, int, netint, long *, values,
                 char *, text, size_t, textlen,
                 double, doublearg, float, floatarg,
                 int, enumarg),
@@ -49,7 +49,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
 )
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
-       TP_ARGS(),
+       LTTNG_UST_TP_ARGS(),
        TP_FIELDS()
 )
 

diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h
index 2478a947ca15ab504a2681c9f8d783d41e0a80e8..c717a4c87cfdc365a9cd6094498836e81ee8cca7 100644 (file)
--- a/tests/compile/hello/ust_tests_hello.h
+++ b/tests/compile/hello/ust_tests_hello.h
@@ -15,7 +15,7 @@
 #include <stddef.h>
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest,
-       TP_ARGS(int, anint, int, netint, long *, values,
+       LTTNG_UST_TP_ARGS(int, anint, int, netint, long *, values,
                char *, text, size_t, textlen,
                double, doublearg, float, floatarg,
                bool, boolarg),
@@ -51,7 +51,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
 )
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
-       TP_ARGS(),
+       LTTNG_UST_TP_ARGS(),
        TP_FIELDS()
 )
 

diff --git a/tests/compile/same_line_tracepoint/ust_tests_sameline.h b/tests/compile/same_line_tracepoint/ust_tests_sameline.h
index 1894a95a7e0c18fe4fd5475d12fcadac2a403ac5..565f74f6ef110bf48cc1e8a5276a81201de6203e 100644 (file)
--- a/tests/compile/same_line_tracepoint/ust_tests_sameline.h
+++ b/tests/compile/same_line_tracepoint/ust_tests_sameline.h
@@ -13,13 +13,13 @@
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(ust_tests_sameline, event1,
-       TP_ARGS(),
+       LTTNG_UST_TP_ARGS(),
        TP_FIELDS()
 )
 TRACEPOINT_LOGLEVEL(ust_tests_sameline, event1, TRACE_CRIT)
 
 TRACEPOINT_EVENT(ust_tests_sameline, event2,
-       TP_ARGS(),
+       LTTNG_UST_TP_ARGS(),
        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 c8307296f7c6acab0cdcef88713e6ec1b8410f80..006b8a1e96190dca9ae67f44cd04972ee50212a9 100644 (file)
--- a/tests/compile/test-app-ctx/ust_tests_hello.h
+++ b/tests/compile/test-app-ctx/ust_tests_hello.h
@@ -15,7 +15,7 @@
 #include <stdbool.h>
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest,
-       TP_ARGS(int, anint, int, netint, long *, values,
+       LTTNG_UST_TP_ARGS(int, anint, int, netint, long *, values,
                char *, text, size_t, textlen,
                double, doublearg, float, floatarg,
                bool, boolarg),
@@ -40,7 +40,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
 )
 
 TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
-       TP_ARGS(),
+       LTTNG_UST_TP_ARGS(),
        TP_FIELDS()
 )