From: Michael Jeanson Date: Tue, 20 Apr 2021 20:28:58 +0000 (-0400) Subject: Tracepoint API namespacing '__tp_stringify' X-Git-Tag: v2.13.0-rc1~47 X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=commitdiff_plain;h=061fc37ae64a1ad3ecefe10d9a2db33ebb5c41ce Tracepoint API namespacing '__tp_stringify' 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: I98e1265e8f9118a27df89e6142ba59fcdd5ae131 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h index a2f54066..4044339d 100644 --- a/include/lttng/tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -15,8 +15,8 @@ #ifdef LTTNG_UST_TRACEPOINT_CREATE_PROBES -#define __tp_stringify1(x) #x -#define __tp_stringify(x) __tp_stringify1(x) +#define lttng_ust__tp_stringify1(x) #x +#define lttng_ust__tp_stringify(x) lttng_ust__tp_stringify1(x) #undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE #define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index 96c69b5a..47e77379 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -1097,7 +1097,7 @@ static const struct lttng_ust_event_desc * const LTTNG_UST__TP_COMBINE_TOKENS(lt const struct lttng_ust_probe_desc LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER) = { .struct_size = sizeof(struct lttng_ust_probe_desc), - .provider_name = __tp_stringify(LTTNG_UST_TRACEPOINT_PROVIDER), + .provider_name = lttng_ust__tp_stringify(LTTNG_UST_TRACEPOINT_PROVIDER), .event_desc = LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__event_desc___, LTTNG_UST_TRACEPOINT_PROVIDER), .nr_events = LTTNG_UST__TP_ARRAY_SIZE(LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__event_desc___, LTTNG_UST_TRACEPOINT_PROVIDER)) - 1, .major = LTTNG_UST_PROVIDER_MAJOR,