0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch

   1 From a7eb2e3d0a4beb1ee80b132927641dd05ef2d542 Mon Sep 17 00:00:00 2001
   2 From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
   3 Date: Mon, 4 Apr 2022 15:49:32 -0400
   4 Subject: [PATCH 02/13] Fix: tracepoint event: allow same provider and event
   5  name
   6
   7 Using the same name for the provider (TRACE_SYSTEM) and event name
   8 causes a compilation error because the same identifiers are emitted
   9 twice.
  10
  11 Fix this by prefixing the provider identifier with
  12 "__provider_event_desc___".
  13
  14 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  15 Change-Id: I8cdf8f859e35b8bd5c19737860d12f1ed546dfc2
  16 ---
  17  include/lttng/tracepoint-event-impl.h | 6 +++---
  18  1 file changed, 3 insertions(+), 3 deletions(-)
  19
  20 diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h
  21 index 38b1dc43..dcb22247 100644
  22 --- a/include/lttng/tracepoint-event-impl.h
  23 +++ b/include/lttng/tracepoint-event-impl.h
  24 @@ -1255,7 +1255,7 @@ static const struct lttng_kernel_event_desc __event_desc___##_map = {     \
  25  #define TP_ID1(_token, _system)        _token##_system
  26  #define TP_ID(_token, _system) TP_ID1(_token, _system)
  27
  28 -static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE_SYSTEM)[] = {
  29 +static const struct lttng_kernel_event_desc * const TP_ID(__provider_event_desc___, TRACE_SYSTEM)[] = {
  30  #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
  31  };
  32
  33 @@ -1274,8 +1274,8 @@ static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE
  34  /* non-const because list head will be modified when registered. */
  35  static __used struct lttng_kernel_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = {
  36         .provider_name = __stringify(TRACE_SYSTEM),
  37 -       .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM),
  38 -       .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)),
  39 +       .event_desc = TP_ID(__provider_event_desc___, TRACE_SYSTEM),
  40 +       .nr_events = ARRAY_SIZE(TP_ID(__provider_event_desc___, TRACE_SYSTEM)),
  41         .head = { NULL, NULL },
  42         .lazy_init_head = { NULL, NULL },
  43         .lazy = 0,
  44 --
  45 2.36.1
  46