From 91fe3e1353806b798ce141de4481de115ea209fe Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 20 Apr 2021 16:50:17 -0400 Subject: [PATCH] Tracepoint API namespacing 'TP_SESSION_CHECK' 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: I7c68548f40594250ba10defcdd0775cdb1a3172e Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/lttng/tracepoint-event.h | 6 ++++++ include/lttng/ust-tracepoint-event.h | 10 +++++----- src/lib/lttng-ust/lttng-ust-statedump.c | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h index 4044339d..0bbecce8 100644 --- a/include/lttng/tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -51,6 +51,12 @@ # endif #endif /* #if LTTNG_UST_COMPAT_API(0) */ +#if LTTNG_UST_COMPAT_API(0) +# if defined(TP_SESSION_CHECK) && !defined(LTTNG_UST_TP_SESSION_CHECK) +# define LTTNG_UST_TP_SESSION_CHECK +# endif +#endif /* #if LTTNG_UST_COMPAT_API(0) */ + #include LTTNG_UST_TRACEPOINT_INCLUDE #include diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index 47e77379..bf7c8377 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -803,11 +803,11 @@ size_t lttng_ust__event_get_align__##_provider##___##_name(LTTNG_UST__TP_ARGS_PR * session this event belongs to. Ensures that we write state dump data only * into the started session, not into all sessions. */ -#undef _TP_SESSION_CHECK -#ifdef TP_SESSION_CHECK -#define _TP_SESSION_CHECK(session, csession) (session == csession) +#undef LTTNG_UST__TP_SESSION_CHECK +#ifdef LTTNG_UST_TP_SESSION_CHECK +#define LTTNG_UST__TP_SESSION_CHECK(session, csession) (session == csession) #else /* TP_SESSION_CHECK */ -#define _TP_SESSION_CHECK(session, csession) 1 +#define LTTNG_UST__TP_SESSION_CHECK(session, csession) 1 #endif /* TP_SESSION_CHECK */ /* @@ -863,7 +863,7 @@ void lttng_ust__event_probe__##_provider##___##_name(LTTNG_UST__TP_ARGS_DATA_PRO struct lttng_ust_channel_buffer *__chan = lttng_ust__event_recorder->chan; \ struct lttng_ust_channel_common *__chan_common = __chan->parent; \ \ - if (!_TP_SESSION_CHECK(session, __chan_common->session)) \ + if (!LTTNG_UST__TP_SESSION_CHECK(session, __chan_common->session)) \ return; \ if (caa_unlikely(!CMM_ACCESS_ONCE(__chan_common->session->active))) \ return; \ diff --git a/src/lib/lttng-ust/lttng-ust-statedump.c b/src/lib/lttng-ust/lttng-ust-statedump.c index 62a94291..3c286c86 100644 --- a/src/lib/lttng-ust/lttng-ust-statedump.c +++ b/src/lib/lttng-ust/lttng-ust-statedump.c @@ -28,7 +28,7 @@ #include "ust_lib.h" /* Only define. */ #define LTTNG_UST_TRACEPOINT_CREATE_PROBES -#define TP_SESSION_CHECK +#define LTTNG_UST_TP_SESSION_CHECK #include "lttng-ust-statedump-provider.h" /* Define and create probes. */ struct dl_iterate_data { -- 2.34.1