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 2542ed2638cf4818941f4510181993cae1653ec3..a13156b8b749d37d177058ee2a5a7136f54b78f4 100644 (file)
--- 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 8af55ea775951533e2dff87fabb782f41923a9d1..5fd54df82f62e03ad739dacf977177ac6fb01109 100644 (file)
--- 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 38de2259fd585eda8417b85446d79c624795c6ca..c4e84f3ef21c219be038759891178f9c60c7b133 100644 (file)
--- 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 0b52f298ee2a9c16cf38d8d2d68eefe39f425618..1f291c4ed65c4f7d33b1fd3742dffd6855013b46 100644 (file)
--- 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 e6064275fd9efcdbbd68334b6230117c8588daa3..01beb165eb75da1ff71c923efe4fac4a4ad5fca4 100644 (file)
--- 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);