Tracepoint API namespacing 'TRACEPOINT_EVENT'

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: I385cbae2b4adcea8551ab8dca66d2a0efe60f9b9
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 a248b7d743d37ca7dd765e226ce5f161d63f5812..f2d80fc8bc306bc8721bb4eb75bccbe2537660a0 100644 (file)
--- a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
+++ b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
@@ -15,7 +15,7 @@
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(
+LTTNG_UST_TRACEPOINT_EVENT(
        TRACEPOINT_PROVIDER,
        align_query,
        LTTNG_UST_TP_ARGS(
@@ -26,7 +26,7 @@ TRACEPOINT_EVENT(
        )
 )
 
-TRACEPOINT_EVENT(
+LTTNG_UST_TRACEPOINT_EVENT(
        TRACEPOINT_PROVIDER,
        test_alignment,
        LTTNG_UST_TP_ARGS(

diff --git a/doc/examples/demo/ust_tests_demo.h b/doc/examples/demo/ust_tests_demo.h
index a7a8158d46aa3ca625003004398c0af5379eb742..7bf37c222398396f644940ec6202453b62398a99 100644 (file)
--- a/doc/examples/demo/ust_tests_demo.h
+++ b/doc/examples/demo/ust_tests_demo.h
@@ -12,7 +12,7 @@
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_demo, starting,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo, starting,
        LTTNG_UST_TP_ARGS(int, value),
        LTTNG_UST_TP_FIELDS(
                ctf_integer(int, value, value)
@@ -27,7 +27,7 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo, starting, TRACE_CRIT)
 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,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo, done,
        LTTNG_UST_TP_ARGS(int, value),
        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 fadb1e4e2d6e9fb4474794d3349a80426cf3bd04..bdcb63260504b06f20b9a46425630d32a5d031df 100644 (file)
--- a/doc/examples/demo/ust_tests_demo2.h
+++ b/doc/examples/demo/ust_tests_demo2.h
@@ -13,7 +13,7 @@
 #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),

diff --git a/doc/examples/demo/ust_tests_demo3.h b/doc/examples/demo/ust_tests_demo3.h
index 26284c4be3709068bf03253d63771f4be5e5e730..0e5960e5405c9dc82f7e187399d167cdc12e2224 100644 (file)
--- a/doc/examples/demo/ust_tests_demo3.h
+++ b/doc/examples/demo/ust_tests_demo3.h
@@ -12,7 +12,7 @@
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_demo3, done,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo3, done,
        LTTNG_UST_TP_ARGS(int, value),
        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 ae29e0ec69d77502221595b6a8b337770be51252..4e9327b96282b6480b5e59d6019dade9b5e3ea0d 100644 (file)
--- a/doc/examples/easy-ust/sample_component_provider.h
+++ b/doc/examples/easy-ust/sample_component_provider.h
@@ -52,7 +52,7 @@
  *
  *    sample_component:message:message = text.
  */
-TRACEPOINT_EVENT(
+LTTNG_UST_TRACEPOINT_EVENT(
        /*
         * provider name, not a variable but a string starting with a letter
         * and containing either letters, numbers or underscores.
@@ -97,12 +97,12 @@ TRACEPOINT_EVENT(
 TRACEPOINT_LOGLEVEL(
        /*
         * The provider name, must be the same as the provider name in the
-        * TRACEPOINT_EVENT and as TRACEPOINT_PROVIDER above.
+        * LTTNG_UST_TRACEPOINT_EVENT and as TRACEPOINT_PROVIDER above.
         */
        sample_component,
        /*
         * The tracepoint name, must be the same as the tracepoint name in the
-        * TRACEPOINT_EVENT
+        * LTTNG_UST_TRACEPOINT_EVENT
         */
        message,
        /*

diff --git a/doc/examples/easy-ust/tp.c b/doc/examples/easy-ust/tp.c
index 233ab03c429406be5e797922f017cfb4398518e6..d46661315d10cf0eb567efa91d430a3ba49dc27b 100644 (file)
--- a/doc/examples/easy-ust/tp.c
+++ b/doc/examples/easy-ust/tp.c
@@ -10,6 +10,6 @@
  */
 #define TRACEPOINT_CREATE_PROBES
 /*
- * The header containing our TRACEPOINT_EVENTs.
+ * The header containing our LTTNG_UST_TRACEPOINT_EVENTs.
  */
 #include "sample_component_provider.h"

diff --git a/doc/examples/gen-tp/sample_tracepoint.tp b/doc/examples/gen-tp/sample_tracepoint.tp
index 5d23f5548bb9ea362565cacc2642e6cf494f73b3..c528c35ade11ae88d7d41ff85dc3ed93beef0ee4 100644 (file)
--- a/doc/examples/gen-tp/sample_tracepoint.tp
+++ b/doc/examples/gen-tp/sample_tracepoint.tp
@@ -1,4 +1,4 @@
-TRACEPOINT_EVENT(
+LTTNG_UST_TRACEPOINT_EVENT(
        sample_tracepoint,
        message, // C++ Style comment
        LTTNG_UST_TP_ARGS(const char *, text),

diff --git a/doc/examples/hello-static-lib/ust_tests_hello.h b/doc/examples/hello-static-lib/ust_tests_hello.h
index e3965ba161a898c05bfc2929b9ee658efc5412fb..22f35c7377ae5b4d1f67352958292eda6cf06584 100644 (file)
--- a/doc/examples/hello-static-lib/ust_tests_hello.h
+++ b/doc/examples/hello-static-lib/ust_tests_hello.h
@@ -13,7 +13,7 @@
 #include <lttng/tracepoint.h>
 #include <stddef.h>
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest,
+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),
@@ -35,7 +35,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
        )
 )
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
        LTTNG_UST_TP_ARGS(),
        LTTNG_UST_TP_FIELDS()
 )

diff --git a/include/lttng/tp/lttng-ust-tracef.h b/include/lttng/tp/lttng-ust-tracef.h
index b99f53155219723cc35c5ab08a6d6e293480b708..393a5e0e885febea9b45c695aace560d86df53f5 100644 (file)
--- a/include/lttng/tp/lttng-ust-tracef.h
+++ b/include/lttng/tp/lttng-ust-tracef.h
@@ -7,7 +7,7 @@
 #include <lttng/tracepoint.h>
 #include <stdarg.h>
 
-TRACEPOINT_EVENT(lttng_ust_tracef, event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_tracef, event,
        LTTNG_UST_TP_ARGS(const char *, msg, unsigned int, len, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_sequence_text(char, msg, msg, unsigned int, len)

diff --git a/include/lttng/tp/lttng-ust-tracelog.h b/include/lttng/tp/lttng-ust-tracelog.h
index 4665f9ac86024227bc6256e3d4ad902b08032f8a..91f40854ffe6835bba1bec4b0d127c9cec1e88a6 100644 (file)
--- a/include/lttng/tp/lttng-ust-tracelog.h
+++ b/include/lttng/tp/lttng-ust-tracelog.h
@@ -7,7 +7,7 @@
 #include <lttng/tracepoint.h>
 #include <stdarg.h>
 
-TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
+LTTNG_UST_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),
        LTTNG_UST_TP_FIELDS(
@@ -20,7 +20,7 @@ TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
 )
 
 #define TP_TRACELOG_TEMPLATE(_level_enum) \
-       TRACEPOINT_EVENT_INSTANCE(lttng_ust_tracelog, tlclass, _level_enum, \
+       LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(lttng_ust_tracelog, tlclass, _level_enum, \
                LTTNG_UST_TP_ARGS(const char *, file, int, line, const char *, func, \
                        const char *, msg, unsigned int, len, void *, ip) \
        ) \

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 85b4ffa67e7d02bd60066397a93c6c7cd5cf1386..74957750d11e2c69210c2aa033617ffbfac3ef8f 100644 (file)
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -9,14 +9,14 @@
 #define __tp_stringify1(x)     #x
 #define __tp_stringify(x)      __tp_stringify1(x)
 
-#undef TRACEPOINT_EVENT_INSTANCE
-#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
+#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
 
-#undef TRACEPOINT_EVENT
-#define TRACEPOINT_EVENT(_provider, _name, _args, _fields)             \
-       TRACEPOINT_EVENT_CLASS(_provider, _name, _TP_PARAMS(_args),     \
+#undef LTTNG_UST_TRACEPOINT_EVENT
+#define LTTNG_UST_TRACEPOINT_EVENT(_provider, _name, _args, _fields)           \
+       LTTNG_UST_TRACEPOINT_EVENT_CLASS(_provider, _name, _TP_PARAMS(_args),   \
                        _TP_PARAMS(_fields))                            \
-       TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name,              \
+       LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name,            \
                        _TP_PARAMS(_args))
 
 
@@ -40,18 +40,18 @@
 #undef LTTNG_UST_TP_ARGS
 #define LTTNG_UST_TP_ARGS(...)       __VA_ARGS__
 
-#undef TRACEPOINT_EVENT
-#define TRACEPOINT_EVENT(provider, name, args, fields)                 \
-       _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))           \
-       _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
+#undef LTTNG_UST_TRACEPOINT_EVENT
+#define LTTNG_UST_TRACEPOINT_EVENT(provider, name, args, fields)                       \
+       LTTNG_UST__DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))         \
+       LTTNG_UST__DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
 
-#undef TRACEPOINT_EVENT_CLASS
-#define TRACEPOINT_EVENT_CLASS(provider, name, args, fields)
+#undef LTTNG_UST_TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST_TRACEPOINT_EVENT_CLASS(provider, name, args, fields)
 
-#undef TRACEPOINT_EVENT_INSTANCE
-#define TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args)     \
-       _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))           \
-       _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
+#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args)   \
+       LTTNG_UST__DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))         \
+       LTTNG_UST__DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
 
 #undef TRACEPOINT_LOGLEVEL
 #define TRACEPOINT_LOGLEVEL(provider, name, loglevel)

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index aa07fdea84c30ecf5642df254ead41511ea5b65a..0f6b34ee39f400712f796d4099a99687164c05c4 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -181,7 +181,7 @@ extern "C" {
  * between caller's ip addresses within the probe using the return
  * address.
  */
-#define _DECLARE_TRACEPOINT(_provider, _name, ...)                                     \
+#define LTTNG_UST__DECLARE_TRACEPOINT(_provider, _name, ...)                                   \
 extern struct lttng_ust_tracepoint __tracepoint_##_provider##___##_name;               \
 static inline                                                                          \
 void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__))              \
@@ -467,7 +467,7 @@ extern struct lttng_ust_tracepoint * const __stop___tracepoints_ptrs[]
  */
 #define _TP_EXTRACT_STRING(...)        #__VA_ARGS__
 
-#define _DEFINE_TRACEPOINT(_provider, _name, _args)                            \
+#define LTTNG_UST__DEFINE_TRACEPOINT(_provider, _name, _args)                          \
        lttng_ust_tracepoint_validate_name_len(_provider, _name);               \
        extern int __tracepoint_provider_##_provider;                           \
        static const char __tp_provider_strtab_##_provider##___##_name[]        \
@@ -564,7 +564,7 @@ __tracepoints__ptrs_destroy(void)
 
 #else /* TRACEPOINT_DEFINE */
 
-#define _DEFINE_TRACEPOINT(_provider, _name, _args)
+#define LTTNG_UST__DEFINE_TRACEPOINT(_provider, _name, _args)
 
 #endif /* #else TRACEPOINT_DEFINE */
 
@@ -628,14 +628,14 @@ __tracepoints__ptrs_destroy(void)
 
 #endif /* #ifndef TRACEPOINT_ENUM */
 
-#ifndef TRACEPOINT_EVENT
+#ifndef LTTNG_UST_TRACEPOINT_EVENT
 
 /*
- * How to use the TRACEPOINT_EVENT macro:
+ * How to use the LTTNG_UST_TRACEPOINT_EVENT macro:
  *
  * An example:
  *
- * TRACEPOINT_EVENT(someproject_component, event_name,
+ * LTTNG_UST_TRACEPOINT_EVENT(someproject_component, event_name,
  *
  *     * LTTNG_UST_TP_ARGS takes from 0 to 10 "type, field_name" pairs *
  *
@@ -712,17 +712,23 @@ __tracepoints__ptrs_destroy(void)
  * the provider:event identifier is limited to 127 characters.
  */
 
-#define TRACEPOINT_EVENT(provider, name, args, fields)                 \
-       _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))           \
-       _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
+#define LTTNG_UST_TRACEPOINT_EVENT(provider, name, args, fields)                       \
+       LTTNG_UST__DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))         \
+       LTTNG_UST__DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
 
-#define TRACEPOINT_EVENT_CLASS(provider, name, args, fields)
+#define LTTNG_UST_TRACEPOINT_EVENT_CLASS(provider, name, args, fields)
 
-#define TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args)     \
-       _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))           \
-       _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
+#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args)   \
+       LTTNG_UST__DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))         \
+       LTTNG_UST__DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
 
-#endif /* #ifndef TRACEPOINT_EVENT */
+#if LTTNG_UST_COMPAT_API(0)
+#define TRACEPOINT_EVENT               LTTNG_UST_TRACEPOINT_EVENT
+#define TRACEPOINT_EVENT_CLASS         LTTNG_UST_TRACEPOINT_EVENT_CLASS
+#define TRACEPOINT_EVENT_INSTANCE      LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#endif /* #ifndef LTTNG_UST_TRACEPOINT_EVENT */
 
 #ifndef TRACEPOINT_LOGLEVEL
 
@@ -778,12 +784,12 @@ __tracepoints__ptrs_destroy(void)
  * debug information with function-level scope
  *
  * TRACE_DEBUG_LINE      13
- * debug information with line-level scope (TRACEPOINT_EVENT default)
+ * debug information with line-level scope (LTTNG_UST_TRACEPOINT_EVENT default)
  *
  * TRACE_DEBUG           14
  * debug-level message
  *
- * Declare tracepoint loglevels for tracepoints. A TRACEPOINT_EVENT
+ * Declare tracepoint loglevels for tracepoints. A LTTNG_UST_TRACEPOINT_EVENT
  * should be declared prior to the the TRACEPOINT_LOGLEVEL for a given
  * tracepoint name. The first field is the provider name, the second
  * field is the name of the tracepoint, the third field is the loglevel

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index 73b3a5ee06925d38ea0a5d6ffb1836f2bfcc44f7..6ba39820e9526f6d8f878bdaf39d0f1d3da4a99a 100644 (file)
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -4,13 +4,13 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-/* Define to "nothing" all macros used for TRACEPOINT_EVENT */
+/* Define to "nothing" all macros used for LTTNG_UST_TRACEPOINT_EVENT */
 
-#undef _TRACEPOINT_EVENT_CLASS
-#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)
 
-#undef _TRACEPOINT_EVENT_INSTANCE
-#define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
+#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
 
 #undef TRACEPOINT_ENUM
 #define TRACEPOINT_ENUM(_provider, _name, _values)

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index d0d7a4c254b285fdee4fde656b26cb5a024e56e9..4a6ebc5aa13942d0e3fbfee6402ef67ef8dd4c2f 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -26,31 +26,31 @@
             pos = cds_list_entry(tp_rcu_dereference(pos->member.next), __typeof__(*pos), member))
 
 /*
- * TRACEPOINT_EVENT_CLASS declares a class of tracepoints receiving the
+ * LTTNG_UST_TRACEPOINT_EVENT_CLASS declares a class of tracepoints receiving the
  * same arguments and having the same field layout.
  *
- * TRACEPOINT_EVENT_INSTANCE declares an instance of a tracepoint, with
+ * LTTNG_UST_TRACEPOINT_EVENT_INSTANCE declares an instance of a tracepoint, with
  * its own provider and name. It refers to a class (template).
  *
- * TRACEPOINT_EVENT declared both a class and an instance and does a
+ * LTTNG_UST_TRACEPOINT_EVENT declared both a class and an instance and does a
  * direct mapping from the instance to the class.
  */
 
-#undef TRACEPOINT_EVENT
-#define TRACEPOINT_EVENT(_provider, _name, _args, _fields)     \
-       _TRACEPOINT_EVENT_CLASS(_provider, _name,               \
+#undef LTTNG_UST_TRACEPOINT_EVENT
+#define LTTNG_UST_TRACEPOINT_EVENT(_provider, _name, _args, _fields)   \
+       LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name,             \
                         _TP_PARAMS(_args),                     \
                         _TP_PARAMS(_fields))                   \
-       _TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name,     \
+       LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name,   \
                         _TP_PARAMS(_args))
 
-#undef TRACEPOINT_EVENT_CLASS
-#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)               \
-       _TRACEPOINT_EVENT_CLASS(_provider, _name, _TP_PARAMS(_args), _TP_PARAMS(_fields))
+#undef LTTNG_UST_TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST_TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)             \
+       LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _TP_PARAMS(_args), _TP_PARAMS(_fields))
 
-#undef TRACEPOINT_EVENT_INSTANCE
-#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)  \
-       _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _TP_PARAMS(_args))
+#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)        \
+       LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _TP_PARAMS(_args))
 
 /* Helpers */
 #define _TP_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@@ -65,11 +65,11 @@
 /*
  * Stage 0 of tracepoint event generation.
  *
- * Check that each TRACEPOINT_EVENT provider argument match the
+ * Check that each LTTNG_UST_TRACEPOINT_EVENT provider argument match the
  * TRACEPOINT_PROVIDER by creating dummy callbacks.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
 static inline
@@ -80,12 +80,12 @@ void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(vo
 {
 }
 
-#undef _TRACEPOINT_EVENT_CLASS
-#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)      \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)    \
        __tracepoint_provider_mismatch_##_provider();
 
-#undef _TRACEPOINT_EVENT_INSTANCE
-#define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
+#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)       \
        __tracepoint_provider_mismatch_##_provider();
 
 static inline
@@ -100,15 +100,15 @@ void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void)
 /*
  * Stage 0.1 of tracepoint event generation.
  *
- * Check that each TRACEPOINT_EVENT provider:name does not exceed the
+ * Check that each LTTNG_UST_TRACEPOINT_EVENT provider:name does not exceed the
  * tracepoint name length limit.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
-#undef _TRACEPOINT_EVENT_INSTANCE
-#define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
+#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)       \
        lttng_ust_tracepoint_validate_name_len(_provider, _name);
 
 #include TRACEPOINT_INCLUDE
@@ -121,18 +121,18 @@ void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void)
  * class and the instance using the class actually match.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
 #undef LTTNG_UST_TP_ARGS
 #define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
-#undef _TRACEPOINT_EVENT_INSTANCE
-#define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
+#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
 void __event_template_proto___##_provider##___##_template(_TP_ARGS_DATA_PROTO(_args));
 
-#undef _TRACEPOINT_EVENT_CLASS
-#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
 void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
 
 #include TRACEPOINT_INCLUDE
@@ -214,7 +214,7 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
  * Verifying array and sequence elements are of an integer type.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 #include <lttng/ust-tracepoint-event-write.h>
 #include <lttng/ust-tracepoint-event-nowrite.h>
@@ -234,8 +234,8 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
 #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)      \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)    \
                _fields
 
 #include TRACEPOINT_INCLUDE
@@ -247,7 +247,7 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
  * Each event produce an array of fields.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 #include <lttng/ust-tracepoint-event-write.h>
 #include <lttng/ust-tracepoint-event-nowrite.h>
@@ -360,8 +360,8 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
 #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)                           \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)                         \
        static const struct lttng_ust_event_field * const __event_fields___##_provider##___##_name[] = { \
                _fields                                                                      \
                ctf_integer(int, dummy, 0)      /* Dummy, C99 forbids 0-len array. */        \
@@ -384,14 +384,14 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
  * Create probe callback prototypes.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
 #undef LTTNG_UST_TP_ARGS
 #define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
 
-#undef _TRACEPOINT_EVENT_CLASS
-#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)              \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)            \
 static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
 
 #include TRACEPOINT_INCLUDE
@@ -402,7 +402,7 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
  * Create static inline function that calculates event size.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 #include <lttng/ust-tracepoint-event-write.h>
 
@@ -460,8 +460,8 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_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)            \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)          \
 static inline                                                                \
 size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS_DATA_PROTO(_args)) \
        lttng_ust_notrace;                                                    \
@@ -489,7 +489,7 @@ size_t __event_get_size__##_provider##___##_name(                         \
  * We make both write and nowrite data available to the filter.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 #include <lttng/ust-tracepoint-event-write.h>
 #include <lttng/ust-tracepoint-event-nowrite.h>
@@ -629,8 +629,8 @@ size_t __event_get_size__##_provider##___##_name(                         \
 #undef LTTNG_UST_TP_FIELDS
 #define LTTNG_UST_TP_FIELDS(...) __VA_ARGS__
 
-#undef _TRACEPOINT_EVENT_CLASS
-#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)            \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)          \
 static inline                                                                \
 void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_data,\
                                                 _TP_ARGS_DATA_PROTO(_args))  \
@@ -651,7 +651,7 @@ void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_da
  * Create static inline function that calculates event payload alignment.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 #include <lttng/ust-tracepoint-event-write.h>
 
@@ -704,8 +704,8 @@ void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_da
 #undef LTTNG_UST_TP_FIELDS
 #define LTTNG_UST_TP_FIELDS(...) __VA_ARGS__
 
-#undef _TRACEPOINT_EVENT_CLASS
-#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)            \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)          \
 static inline                                                                \
 size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
        lttng_ust_notrace;                                                    \
@@ -727,7 +727,7 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
  * and writes event data into the buffer.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 #include <lttng/ust-tracepoint-event-write.h>
 
@@ -830,8 +830,8 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
  * 2*sizeof(unsigned long) for all supported architectures.
  * Perform UNION (||) of filter runtime list.
  */
-#undef _TRACEPOINT_EVENT_CLASS
-#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)            \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)          \
 static                                                                       \
 void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))              \
        lttng_ust_notrace;                                                    \
@@ -930,7 +930,7 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))           \
  * Create probe signature
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
 #undef LTTNG_UST_TP_ARGS
@@ -938,8 +938,8 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))           \
 
 #define _TP_EXTRACT_STRING2(...)       #__VA_ARGS__
 
-#undef _TRACEPOINT_EVENT_CLASS
-#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)      \
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)    \
 static const char __tp_event_signature___##_provider##___##_name[] =   \
                _TP_EXTRACT_STRING2(_args);
 
@@ -956,7 +956,7 @@ static const char __tp_event_signature___##_provider##___##_name[] =        \
  * the compiler will complain.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
 /*
@@ -988,7 +988,7 @@ LTTNG_UST_TP_EXTERN_C const int * const _loglevel___##__provider##___##__name       \
  * Tracepoint UML URI info.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
 /*
@@ -1039,11 +1039,11 @@ extern const struct lttng_ust_probe_desc _TP_COMBINE_TOKENS(__probe_desc___, TRA
  * to ensure C++ compilers default-initialize them.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
-#undef _TRACEPOINT_EVENT_INSTANCE
-#define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)        \
+#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)              \
 static const int *                                                            \
        __ref_loglevel___##_provider##___##_name                               \
        __attribute__((weakref ("_loglevel___" #_provider "___" #_name)));     \
@@ -1070,11 +1070,11 @@ static const struct lttng_ust_event_desc __event_desc___##_provider##_##_name =
  * Create array of events.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
-#undef _TRACEPOINT_EVENT_INSTANCE
-#define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)        \
+#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)              \
        &__event_desc___##_provider##_##_name,
 
 static const struct lttng_ust_event_desc * const _TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER)[] = {
@@ -1112,7 +1112,7 @@ static struct lttng_ust_registered_probe *_TP_COMBINE_TOKENS(__lttng_ust_probe_r
  * Register refcount is protected by libc dynamic loader mutex.
  */
 
-/* Reset all macros within TRACEPOINT_EVENT */
+/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 static void
 _TP_COMBINE_TOKENS(__lttng_ust_events_init__, TRACEPOINT_PROVIDER)(void)

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 39ce675ec2562a091f0aedda6059bf83794d0466..81b67714a30c55890f2b8bdc1362220038db43d2 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
@@ -16,7 +16,7 @@ extern "C" {
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_entry,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_entry,
        LTTNG_UST_TP_ARGS(void *, func_addr),
        LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(unsigned long, addr,
@@ -27,7 +27,7 @@ TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_entry,
 TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile_fast, func_entry,
        TRACE_DEBUG_FUNCTION)
 
-TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_exit,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_exit,
        LTTNG_UST_TP_ARGS(void *, func_addr),
        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 e5451c323cb847912c35cf5f02d7311c1de10a1e..0df21538c7952fefa80bed3d1f24eda2b2218c77 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
@@ -16,7 +16,7 @@ extern "C" {
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT_CLASS(lttng_ust_cyg_profile, func_class,
+LTTNG_UST_TRACEPOINT_EVENT_CLASS(lttng_ust_cyg_profile, func_class,
        LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site),
        LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(unsigned long, addr,
@@ -26,7 +26,7 @@ TRACEPOINT_EVENT_CLASS(lttng_ust_cyg_profile, func_class,
        )
 )
 
-TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
+LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
        func_entry,
        LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site)
 )
@@ -34,7 +34,7 @@ TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
 TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_entry,
        TRACE_DEBUG_FUNCTION)
 
-TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
+LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
        func_exit,
        LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site)
 )

diff --git a/src/lib/lttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h
index 01c32ddc74877a9b85352a0da88065b48b75abbd..893eae3aa8e984116ed4d9161ff784876be55414 100644 (file)
--- a/src/lib/lttng-ust-dl/ust_dl.h
+++ b/src/lib/lttng-ust-dl/ust_dl.h
@@ -22,7 +22,7 @@ extern "C" {
 #define LTTNG_UST_DL_PROVIDER
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
+LTTNG_UST_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),
@@ -38,7 +38,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
 )
 
 #ifdef HAVE_DLMOPEN
-TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
        LTTNG_UST_TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
                const char *, path, int, flags,
                uint64_t, memsz, uint8_t, has_build_id,
@@ -56,7 +56,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
 )
 #endif
 
-TRACEPOINT_EVENT(lttng_ust_dl, build_id,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, build_id,
        LTTNG_UST_TP_ARGS(
                void *, ip,
                void *, baddr,
@@ -71,7 +71,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, build_id,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
        LTTNG_UST_TP_ARGS(
                void *, ip,
                void *, baddr,
@@ -86,7 +86,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
        LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
        LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)

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 398c14d459105054e79ea8ba098792b23cd1a1ab..2d7cbbbfee2dbf90df57a4079701d5df233b51dc 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
@@ -15,7 +15,7 @@
 /*
  * Tracepoint used by Java applications using the JUL handler.
  */
-TRACEPOINT_EVENT(lttng_jul, event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_jul, event,
        LTTNG_UST_TP_ARGS(
                const char *, msg,
                const char *, logger_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 25c7647db3f3d73145ace5b7a34f8f18670f3d5b..4aaa595682a9e3d1b705d466339242eac5c99d06 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
@@ -15,7 +15,7 @@
 /*
  * Tracepoint used by Java applications using the log4j log appender.
  */
-TRACEPOINT_EVENT(lttng_log4j, event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_log4j, event,
        LTTNG_UST_TP_ARGS(
                const char *, msg,
                const char *, logger_name,

diff --git a/src/lib/lttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h
index 887220681c2bdf05634dba2a00d5e3bcb390d2c7..12026f781fe9965c18f625c66f9f4c22faf9f009 100644 (file)
--- a/src/lib/lttng-ust-java/lttng_ust_java.h
+++ b/src/lib/lttng-ust-java/lttng_ust_java.h
@@ -12,7 +12,7 @@
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_java, int_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, int_event,
        LTTNG_UST_TP_ARGS(const char *, name, int, payload),
        LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)
@@ -20,7 +20,7 @@ TRACEPOINT_EVENT(lttng_ust_java, int_event,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
        LTTNG_UST_TP_ARGS(const char *, name, int, payload1, int, payload2),
        LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)
@@ -29,7 +29,7 @@ TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, long_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, long_event,
        LTTNG_UST_TP_ARGS(const char *, name, long, payload),
        LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)
@@ -37,7 +37,7 @@ TRACEPOINT_EVENT(lttng_ust_java, long_event,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
        LTTNG_UST_TP_ARGS(const char *, name, long, payload1, long, payload2),
        LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)
@@ -46,7 +46,7 @@ TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, string_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, string_event,
        LTTNG_UST_TP_ARGS(const char *, name, const char *, payload),
        LTTNG_UST_TP_FIELDS(
                ctf_string(name, name)

diff --git a/src/lib/lttng-ust-libc-wrapper/ust_libc.h b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
index 5008ce8d761bd0b29a043e1bdc05bbea4a987eb4..621d45ea61f30b6a791cb434b8eb1b479725e69c 100644 (file)
--- a/src/lib/lttng-ust-libc-wrapper/ust_libc.h
+++ b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
@@ -16,7 +16,7 @@ extern "C" {
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_libc, malloc,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, malloc,
        LTTNG_UST_TP_ARGS(size_t, size, void *, ptr, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer(size_t, size, size)
@@ -25,7 +25,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, malloc,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, free,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, free,
        LTTNG_UST_TP_ARGS(void *, ptr, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, ptr, ptr)
@@ -33,7 +33,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, free,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, calloc,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, calloc,
        LTTNG_UST_TP_ARGS(size_t, nmemb, size_t, size, void *, ptr, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer(size_t, nmemb, nmemb)
@@ -43,7 +43,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, calloc,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, realloc,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, realloc,
        LTTNG_UST_TP_ARGS(void *, in_ptr, size_t, size, void *, ptr, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, in_ptr, in_ptr)
@@ -53,7 +53,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, realloc,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, memalign,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, memalign,
        LTTNG_UST_TP_ARGS(size_t, alignment, size_t, size, void *, ptr, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer(size_t, alignment, alignment)
@@ -63,7 +63,7 @@ TRACEPOINT_EVENT(lttng_ust_libc, memalign,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
        LTTNG_UST_TP_ARGS(void *, out_ptr, size_t, alignment, size_t, size, int, result, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, out_ptr, out_ptr)

diff --git a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
index d22eab2e0555ea1d3ceaac1b84bf8d8eb912dad5..03dfcd3ee564d9b6f7fdb138c2524447b1362a9b 100644 (file)
--- a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
+++ b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
@@ -16,7 +16,7 @@ extern "C" {
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
@@ -24,7 +24,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
@@ -33,7 +33,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)
@@ -42,7 +42,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
        LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, mutex, mutex)

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 d2f4ef56f1af1ac2255fafa5ea50a3a84778ebae..dc8af4f867d6a3e9c7692437c7bdadf6a57079d1 100644 (file)
--- a/src/lib/lttng-ust-python-agent/lttng_ust_python.h
+++ b/src/lib/lttng-ust-python-agent/lttng_ust_python.h
@@ -13,7 +13,7 @@
 #include <lttng/tracepoint.h>
 #include <stdbool.h>
 
-TRACEPOINT_EVENT(lttng_python, event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_python, event,
        LTTNG_UST_TP_ARGS(
                const char *, asctime,
                const char *, msg,

diff --git a/src/lib/lttng-ust/lttng-probes.c b/src/lib/lttng-ust/lttng-probes.c
index edc042f3dc11bed45b3b27c1452b684ac7d019fd..4552e5e82880d48f800093675f3986b4f6a30cba 100644 (file)
--- a/src/lib/lttng-ust/lttng-probes.c
+++ b/src/lib/lttng-ust/lttng-probes.c
@@ -76,7 +76,7 @@ void lttng_lazy_probe_register(struct lttng_ust_registered_probe *reg_probe)
 
        /*
         * The provider ensures there are no duplicate event names.
-        * Duplicated TRACEPOINT_EVENT event names would generate a
+        * Duplicated LTTNG_UST_TRACEPOINT_EVENT event names would generate a
         * compile-time error due to duplicated symbol names.
         */
 

diff --git a/src/lib/lttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
index e1a2ed78c449b7dfa0b82953ad2c52f26dc198fd..c4fa06d55b4b57abffb1b5bcd1f77e22cc58d220 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-statedump-provider.h
+++ b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
@@ -23,14 +23,14 @@ extern "C" {
 #define LTTNG_UST_STATEDUMP_PROVIDER
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_statedump, start,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, start,
        LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
        LTTNG_UST_TP_FIELDS(
                ctf_unused(session)
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
        LTTNG_UST_TP_ARGS(
                struct lttng_ust_session *, session,
                void *, baddr,
@@ -51,7 +51,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
        LTTNG_UST_TP_ARGS(
                struct lttng_ust_session *, session,
                void *, baddr,
@@ -66,7 +66,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
        LTTNG_UST_TP_ARGS(
                struct lttng_ust_session *, session,
                void *, baddr,
@@ -81,7 +81,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, procname,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, procname,
        LTTNG_UST_TP_ARGS(
                struct lttng_ust_session *, session,
                char *, name
@@ -92,7 +92,7 @@ TRACEPOINT_EVENT(lttng_ust_statedump, procname,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, end,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, end,
        LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
        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 3f9e208c03745a5d4d333a885631f23e821a1e01..2c3d1169ac08c7924b42952a80c5e75ff885bc54 100644 (file)
--- a/src/lib/lttng-ust/ust_lib.h
+++ b/src/lib/lttng-ust/ust_lib.h
@@ -23,7 +23,7 @@ extern "C" {
 #define LTTNG_UST_LIB_PROVIDER
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_lib, load,
+LTTNG_UST_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),
@@ -37,7 +37,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, load,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_lib, build_id,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, build_id,
        LTTNG_UST_TP_ARGS(
                void *, ip,
                void *, baddr,
@@ -52,7 +52,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, build_id,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
        LTTNG_UST_TP_ARGS(
                void *, ip,
                void *, baddr,
@@ -67,7 +67,7 @@ TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_lib, unload,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, unload,
        LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
        LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)

diff --git a/tests/benchmark/ust_tests_benchmark.h b/tests/benchmark/ust_tests_benchmark.h
index 522564dd02bfcca1aeadff3761da2438551397ad..badb90811abcaabf59996fd63900a6f131604e93 100644 (file)
--- a/tests/benchmark/ust_tests_benchmark.h
+++ b/tests/benchmark/ust_tests_benchmark.h
@@ -12,7 +12,7 @@
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_benchmark, tpbench,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_benchmark, tpbench,
        LTTNG_UST_TP_ARGS(int, value),
        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 c9f667b84f0129b9c1fe3e09837ee922aa4cd8f0..674950eb3d7ab154f02c48c017f3ae5dfc464271 100644 (file)
--- a/tests/compile/ctf-types/ust_tests_ctf_types.h
+++ b/tests/compile/ctf-types/ust_tests_ctf_types.h
@@ -33,7 +33,7 @@ TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
  * Enumeration field is used twice to make sure the type declaration
  * is entered only once in the metadata file.
  */
-TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
        LTTNG_UST_TP_ARGS(int, anint, int, enumval, int, enumval2),
        LTTNG_UST_TP_FIELDS(
                ctf_integer(int, intfield, anint)
@@ -49,7 +49,7 @@ TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
  * Another tracepoint using the types to make sure each type is entered
  * only once in the metadata file.
  */
-TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
        LTTNG_UST_TP_ARGS(int, anint, int, enumval),
        LTTNG_UST_TP_FIELDS(
                ctf_integer(int, intfield, anint)

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

diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h
index 6da2c4dfe735bd496f6ee8d733d9cae53b2cd4ef..c6fde916a854bf3ed80ee0b2de3440f5c2dcb1af 100644 (file)
--- a/tests/compile/hello.cxx/ust_tests_hello.h
+++ b/tests/compile/hello.cxx/ust_tests_hello.h
@@ -24,7 +24,7 @@ TRACEPOINT_ENUM(ust_tests_hello, my_enum,
        )
 )
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest,
+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,
@@ -48,7 +48,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
        )
 )
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
        LTTNG_UST_TP_ARGS(),
        LTTNG_UST_TP_FIELDS()
 )

diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h
index 17c2051709bd3a63a888aacf20a9c1c1a5e027f8..77993708082a7932fd022842e328274b4f677d46 100644 (file)
--- a/tests/compile/hello/ust_tests_hello.h
+++ b/tests/compile/hello/ust_tests_hello.h
@@ -14,7 +14,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest,
+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,
@@ -50,7 +50,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
        )
 )
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
        LTTNG_UST_TP_ARGS(),
        LTTNG_UST_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 5f0ee954bc14ee059f4ed42f95e9bc13ee37efaf..5efd48085607b9b54ced04f2cff54d10e191b887 100644 (file)
--- a/tests/compile/same_line_tracepoint/ust_tests_sameline.h
+++ b/tests/compile/same_line_tracepoint/ust_tests_sameline.h
@@ -12,13 +12,13 @@
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_sameline, event1,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_sameline, event1,
        LTTNG_UST_TP_ARGS(),
        LTTNG_UST_TP_FIELDS()
 )
 TRACEPOINT_LOGLEVEL(ust_tests_sameline, event1, TRACE_CRIT)
 
-TRACEPOINT_EVENT(ust_tests_sameline, event2,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_sameline, event2,
        LTTNG_UST_TP_ARGS(),
        LTTNG_UST_TP_FIELDS()
 )

diff --git a/tests/compile/test-app-ctx/ust_tests_hello.h b/tests/compile/test-app-ctx/ust_tests_hello.h
index 07051e12e3591d136c41ce3d505d48db2d925f48..1c87c5d155b600d950903dc97cc10d56cf8658db 100644 (file)
--- a/tests/compile/test-app-ctx/ust_tests_hello.h
+++ b/tests/compile/test-app-ctx/ust_tests_hello.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest,
+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,
@@ -39,7 +39,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
        )
 )
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
        LTTNG_UST_TP_ARGS(),
        LTTNG_UST_TP_FIELDS()
 )

diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
index a62107f7b2006fcd876901f85aed5df2d7d9cb8f..919f01a31d964b5fe150e7883ab4e9f43de045d3 100755 (executable)
--- a/tools/lttng-gen-tp
+++ b/tools/lttng-gen-tp
@@ -59,7 +59,7 @@ class CFile:
     FILE_TPL = """
 #define TRACEPOINT_CREATE_PROBES
 /*
- * The header containing our TRACEPOINT_EVENTs.
+ * The header containing our LTTNG_UST_TRACEPOINT_EVENTs.
  */
 #define TRACEPOINT_DEFINE
 #include "{headerFilename}"
@@ -170,7 +170,7 @@ class TemplateFile:
         cleantext = re.sub("\s*", "", nolinecomment)
         # Remove multine C style comments
         nocomment = re.sub("/\*.*?\*/", "", cleantext)
-        entries = re.split("TRACEPOINT_.*?", nocomment)
+        entries = re.split("LTTNG_UST_TRACEPOINT_.*?", nocomment)
 
         for entry in entries:
             if entry != '':
@@ -200,7 +200,7 @@ usage = """
  When using the -o option, the OUTPUT_FILE must end with either .h, .c or .o
  The -o option can be repeated multiple times.
 
- The template file must contains TRACEPOINT_EVENT and TRACEPOINT_LOGLEVEL
+ The template file must contains LTTNG_UST_TRACEPOINT_EVENT and TRACEPOINT_LOGLEVEL
  as per defined in the lttng/tracepoint.h file.
  See the lttng-ust(3) man page for more details on the format.
 """