From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 11 Mar 2021 21:48:47 +0000 (-0500)
Subject: Namespace private ABI lttng_transport_find symbol
X-Git-Tag: v2.13.0-rc1~278
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=65c48d6a4b532436c000f8b3b9b771cfe9c07491;p=lttng-ust.git

Namespace private ABI lttng_transport_find symbol

The major SONAME bump to '1' gives us the opportunity to properly
namespace public symbols. This symbol is part of the ABI between
liblttng-ust-ctl and liblltng-ust and is not part of the public API.

Change-Id: Ibdb33aff98f7b974fac3c28889718851286ce2f9
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 2542ed26..a13156b8 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -616,8 +616,6 @@ void lttng_ust_probe_unregister(struct lttng_ust_probe_desc *desc);
  */
 void lttng_ust_context_procname_reset(void);
 
-struct lttng_transport *lttng_transport_find(const char *name);
-
 void lttng_ust_dl_update(void *ip);
 
 #ifdef __cplusplus
diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 8af55ea7..5fd54df8 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -1268,7 +1268,7 @@ struct ustctl_consumer_channel *
 		return NULL;
 	}
 
-	transport = lttng_transport_find(transport_name);
+	transport = lttng_ust_transport_find(transport_name);
 	if (!transport) {
 		DBG("LTTng transport %s not found\n",
 			transport_name);
diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 38de2259..c4e84f3e 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -522,7 +522,7 @@ int lttng_abi_map_channel(int session_objd,
 		ret = -EINVAL;
 		goto notransport;
 	}
-	transport = lttng_transport_find(transport_name);
+	transport = lttng_ust_transport_find(transport_name);
 	if (!transport) {
 		DBG("LTTng transport %s not found\n",
 		       transport_name);
diff --git a/liblttng-ust/ust-core.c b/liblttng-ust/ust-core.c
index 0b52f298..1f291c4e 100644
--- a/liblttng-ust/ust-core.c
+++ b/liblttng-ust/ust-core.c
@@ -17,7 +17,7 @@
 static CDS_LIST_HEAD(lttng_transport_list);
 static CDS_LIST_HEAD(lttng_counter_transport_list);
 
-struct lttng_transport *lttng_transport_find(const char *name)
+struct lttng_transport *lttng_ust_transport_find(const char *name)
 {
 	struct lttng_transport *transport;
 
diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index e6064275..01beb165 100644
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -596,6 +596,9 @@ void lttng_transport_register(struct lttng_transport *transport);
 __attribute__((visibility("hidden")))
 void lttng_transport_unregister(struct lttng_transport *transport);
 
+/* This is ABI between liblttng-ust and liblttng-ust-ctl */
+struct lttng_transport *lttng_ust_transport_find(const char *name);
+
 __attribute__((visibility("hidden")))
 void lttng_probe_provider_unregister_events(struct lttng_ust_probe_desc *desc);