From c1d5ecdf1a6dd50e6be3387f666c206976f517b4 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 13 Jun 2022 15:06:15 -0400 Subject: [PATCH 1/1] Custom upgrade: suffix getcpu plugin symbol with 1 Signed-off-by: Mathieu Desnoyers Change-Id: I44e451258ff1570bf5f6bbb40650a6059c72811b --- include/lttng/ust-getcpu.h | 7 +++++++ src/lib/lttng-ust-common/getcpu.c | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/include/lttng/ust-getcpu.h b/include/lttng/ust-getcpu.h index f5f08c6b..efd34f21 100644 --- a/include/lttng/ust-getcpu.h +++ b/include/lttng/ust-getcpu.h @@ -9,6 +9,13 @@ #include #include +#include + +/* Custom upgrade 2.12 to 2.13 */ + +#ifndef LTTNG_UST_CUSTOM_UPGRADE_CONFLICTING_SYMBOLS +#define lttng_ust_getcpu_override lttng_ust_getcpu_override1 +#endif /* * Set getcpu override read callback. This callback should return the diff --git a/src/lib/lttng-ust-common/getcpu.c b/src/lib/lttng-ust-common/getcpu.c index e80bcf1f..748ca391 100644 --- a/src/lib/lttng-ust-common/getcpu.c +++ b/src/lib/lttng-ust-common/getcpu.c @@ -25,7 +25,7 @@ void *getcpu_plugin_handle; /* * Override the user provided getcpu implementation. */ -int lttng_ust_getcpu_override(int (*getcpu)(void)) +static int lttng_ust_getcpu_override_orig(int (*getcpu)(void)) { CMM_STORE_SHARED(lttng_ust_get_cpu_sym, getcpu); return 0; @@ -75,3 +75,14 @@ void lttng_ust_getcpu_plugin_init(void) /* Run the user provided getcpu plugin init function. */ getcpu_plugin_init(); } + +/* Custom upgrade 2.12 to 2.13 */ + +#undef lttng_ust_getcpu_override +int lttng_ust_getcpu_override1(int (*getcpu)(void)) + __attribute__ ((alias ("lttng_ust_getcpu_override_orig"))); + +#ifdef LTTNG_UST_CUSTOM_UPGRADE_CONFLICTING_SYMBOLS +int lttng_ust_getcpu_override(int (*getcpu)(void)) + __attribute__ ((alias ("lttng_ust_getcpu_override_orig"))); +#endif -- 2.34.1