| From a7eb2e3d0a4beb1ee80b132927641dd05ef2d542 Mon Sep 17 00:00:00 2001 |
| From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| Date: Mon, 4 Apr 2022 15:49:32 -0400 |
| Subject: [PATCH 02/10] Fix: tracepoint event: allow same provider and event |
| name |
| |
| Using the same name for the provider (TRACE_SYSTEM) and event name |
| causes a compilation error because the same identifiers are emitted |
| twice. |
| |
| Fix this by prefixing the provider identifier with |
| "__provider_event_desc___". |
| |
| Upstream-Status: Backport |
| |
| Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| Change-Id: I8cdf8f859e35b8bd5c19737860d12f1ed546dfc2 |
| --- |
| include/lttng/tracepoint-event-impl.h | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h |
| index 38b1dc43..dcb22247 100644 |
| --- a/include/lttng/tracepoint-event-impl.h |
| +++ b/include/lttng/tracepoint-event-impl.h |
| @@ -1255,7 +1255,7 @@ static const struct lttng_kernel_event_desc __event_desc___##_map = { \ |
| #define TP_ID1(_token, _system) _token##_system |
| #define TP_ID(_token, _system) TP_ID1(_token, _system) |
| |
| -static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE_SYSTEM)[] = { |
| +static const struct lttng_kernel_event_desc * const TP_ID(__provider_event_desc___, TRACE_SYSTEM)[] = { |
| #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |
| }; |
| |
| @@ -1274,8 +1274,8 @@ static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE |
| /* non-const because list head will be modified when registered. */ |
| static __used struct lttng_kernel_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { |
| .provider_name = __stringify(TRACE_SYSTEM), |
| - .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM), |
| - .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)), |
| + .event_desc = TP_ID(__provider_event_desc___, TRACE_SYSTEM), |
| + .nr_events = ARRAY_SIZE(TP_ID(__provider_event_desc___, TRACE_SYSTEM)), |
| .head = { NULL, NULL }, |
| .lazy_init_head = { NULL, NULL }, |
| .lazy = 0, |
| -- |
| 2.19.1 |
| |