tracepoint: namespace systemtap UST macros with LTTNG_UST_ prefix

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I7eba388a741917e790e0c270c3b898fc9ea8ebb2

diff --git a/include/lttng/tracef.h b/include/lttng/tracef.h
index 1b455063915863f645fcc6e6d2d479fb03a60856..6890027d976c407b5cd86e9180be2665ae67c25c 100644 (file)
--- a/include/lttng/tracef.h
+++ b/include/lttng/tracef.h
@@ -23,7 +23,7 @@ void _lttng_ust_vtracef(const char *fmt, va_list ap)
 
 #define tracef(fmt, ...)                                               \
        do {                                                            \
-               LTTNG_STAP_PROBEV(tracepoint_lttng_ust_tracef, event, ## __VA_ARGS__); \
+               LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracef, event, ## __VA_ARGS__); \
                if (caa_unlikely(__tracepoint_lttng_ust_tracef___event.state)) \
                        _lttng_ust_tracef(fmt, ## __VA_ARGS__);         \
        } while (0)

diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h
index 336911f4d5b243befd7c3a611a312fdce0138991..d5fd93694b4980c5953909dfce16ed9681aad437 100644 (file)
--- a/include/lttng/tracelog.h
+++ b/include/lttng/tracelog.h
@@ -43,7 +43,7 @@ TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG);
 
 #define tracelog(level, fmt, ...)                                      \
        do {                                                            \
-               LTTNG_STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \
+               LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \
                if (caa_unlikely(__tracepoint_lttng_ust_tracelog___##level.state)) \
                        _lttng_ust_tracelog_##level(__FILE__, __LINE__, __func__, \
                                fmt, ## __VA_ARGS__);                   \

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 49db615a0996e49b067534e388baaa360a820292..b47b1e0e1c00ab5eb5d1a79356762b8852b35874 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -28,19 +28,19 @@
  */
 #include <sys/sdt.h>
 
-#define _LTTNG_SDT_NARG(...) \
-       __LTTNG_SDT_NARG(__VA_ARGS__, 12,11,10,9,8,7,6,5,4,3,2,1,0)
+#define _LTTNG_UST_SDT_NARG(...) \
+       __LTTNG_UST_SDT_NARG(__VA_ARGS__, 12,11,10,9,8,7,6,5,4,3,2,1,0)
 
-#define __LTTNG_SDT_NARG(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12, N, ...) N
+#define __LTTNG_UST_SDT_NARG(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12, N, ...) N
 
-#define _LTTNG_SDT_PROBE_N(provider, name, N, ...) \
+#define _LTTNG_UST_SDT_PROBE_N(provider, name, N, ...) \
        _SDT_PROBE(provider, name, N, (__VA_ARGS__))
 
-#define LTTNG_STAP_PROBEV(provider, name, ...) \
-       _LTTNG_SDT_PROBE_N(provider, name, _LTTNG_SDT_NARG(0, ##__VA_ARGS__), ##__VA_ARGS__)
+#define LTTNG_UST_STAP_PROBEV(provider, name, ...) \
+       _LTTNG_UST_SDT_PROBE_N(provider, name, _LTTNG_UST_SDT_NARG(0, ##__VA_ARGS__), ##__VA_ARGS__)
 
 #else
-#define LTTNG_STAP_PROBEV(...)
+#define LTTNG_UST_STAP_PROBEV(...)
 #endif
 
 #ifdef __cplusplus
@@ -55,7 +55,7 @@ extern "C" {
 
 #define tracepoint(provider, name, ...)                                            \
        do {                                                                \
-               LTTNG_STAP_PROBEV(provider, name, ## __VA_ARGS__);          \
+               LTTNG_UST_STAP_PROBEV(provider, name, ## __VA_ARGS__);      \
                if (tracepoint_enabled(provider, name))                     \
                        do_tracepoint(provider, name, __VA_ARGS__);         \
        } while (0)