From b88f9167c530abc0726b43f18154a8629ee289b8 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 15 Apr 2021 15:56:48 -0400 Subject: [PATCH] tracepoint: namespace systemtap UST macros with LTTNG_UST_ prefix Signed-off-by: Mathieu Desnoyers Change-Id: I7eba388a741917e790e0c270c3b898fc9ea8ebb2 --- include/lttng/tracef.h | 2 +- include/lttng/tracelog.h | 2 +- include/lttng/tracepoint.h | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/lttng/tracef.h b/include/lttng/tracef.h index 1b455063..6890027d 100644 --- 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 336911f4..d5fd9369 100644 --- 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 49db615a..b47b1e0e 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -28,19 +28,19 @@ */ #include -#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) -- 2.34.1