From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Jun 2022 18:56:53 +0000 (-0400)
Subject: Custom upgrade: suffix cancelstate symbols with 1
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=606ca558590fb07b57791d2517a31e59b95e440f;p=lttng-ust.git

Custom upgrade: suffix cancelstate symbols with 1

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I107cd5c0a63c9b16498580baf9906520c39d4bfc
---

diff --git a/include/lttng/ust-cancelstate.h b/include/lttng/ust-cancelstate.h
index efca9ac6..45cbfc58 100644
--- a/include/lttng/ust-cancelstate.h
+++ b/include/lttng/ust-cancelstate.h
@@ -7,6 +7,15 @@
 #ifndef _LTTNG_UST_UST_CANCELSTATE_H
 #define _LTTNG_UST_UST_CANCELSTATE_H
 
+#include <lttng/ust-config.h>
+
+/* Custom upgrade 2.12 to 2.13 */
+
+#ifndef LTTNG_UST_CUSTOM_UPGRADE_CONFLICTING_SYMBOLS
+#define lttng_ust_cancelstate_disable_push	lttng_ust_cancelstate_disable_push1
+#define lttng_ust_cancelstate_disable_pop	lttng_ust_cancelstate_disable_pop1
+#endif
+
 int lttng_ust_cancelstate_disable_push(void);
 int lttng_ust_cancelstate_disable_pop(void);
 
diff --git a/src/lib/lttng-ust-common/ust-cancelstate.c b/src/lib/lttng-ust-common/ust-cancelstate.c
index e42c7b4e..4c7e24e0 100644
--- a/src/lib/lttng-ust-common/ust-cancelstate.c
+++ b/src/lib/lttng-ust-common/ust-cancelstate.c
@@ -19,7 +19,7 @@ struct ust_cancelstate {
 
 static DEFINE_URCU_TLS(struct ust_cancelstate, thread_state);
 
-int lttng_ust_cancelstate_disable_push(void)
+static int lttng_ust_cancelstate_disable_push_orig(void)
 {
 	struct ust_cancelstate *state = &URCU_TLS(thread_state);
 	int ret, oldstate;
@@ -36,7 +36,7 @@ end:
 	return 0;
 }
 
-int lttng_ust_cancelstate_disable_pop(void)
+static int lttng_ust_cancelstate_disable_pop_orig(void)
 {
 	struct ust_cancelstate *state = &URCU_TLS(thread_state);
 	int ret, oldstate;
@@ -58,4 +58,19 @@ end:
 	return 0;
 }
 
+/* Custom upgrade 2.12 to 2.13 */
+
+#undef lttng_ust_cancelstate_disable_push
+#undef lttng_ust_cancelstate_disable_pop
 
+int lttng_ust_cancelstate_disable_push1(void)
+	__attribute ((alias ("lttng_ust_cancelstate_disable_push_orig")));
+int lttng_ust_cancelstate_disable_pop1(void)
+	__attribute ((alias ("lttng_ust_cancelstate_disable_pop_orig")));
+
+#ifdef LTTNG_UST_CUSTOM_UPGRADE_CONFLICTING_SYMBOLS
+int lttng_ust_cancelstate_disable_push(void)
+	__attribute ((alias ("lttng_ust_cancelstate_disable_push_orig")));
+int lttng_ust_cancelstate_disable_pop(void)
+	__attribute ((alias ("lttng_ust_cancelstate_disable_pop_orig")));
+#endif