Hide forward declaration of struct lttng_event_notifier_group

[lttng-ust.git] / liblttng-ust / lttng-ust-abi.c

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 1b21b80e50ea7b1453b126a0becb90eb6a0db033..4674d000a804043ec2a54cc328de978711d84cf0 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -30,7 +30,6 @@
 #include <urcu/compiler.h>
 #include <urcu/list.h>
 
-#include <ust-helper.h>
 #include <lttng/tracepoint.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-error.h>
@@ -47,6 +46,7 @@
 #include "string-utils.h"
 #include "ust-events-internal.h"
 #include "context-internal.h"
+#include "ust-helper.h"
 
 #define OBJ_NAME_LEN   16
 
@@ -289,7 +289,7 @@ int lttng_abi_create_root_handle(void)
 static
 int lttng_is_channel_ready(struct lttng_channel *lttng_chan)
 {
-       struct channel *chan;
+       struct lttng_ust_lib_ring_buffer_channel *chan;
        unsigned int nr_streams, exp_streams;
 
        chan = lttng_chan->chan;
@@ -301,7 +301,7 @@ int lttng_is_channel_ready(struct lttng_channel *lttng_chan)
 static
 int lttng_abi_create_session(void *owner)
 {
-       struct lttng_session *session;
+       struct lttng_ust_session *session;
        int session_objd, ret;
 
        session = lttng_session_create();
@@ -379,7 +379,7 @@ static
 long lttng_abi_add_context(int objd,
        struct lttng_ust_abi_context *context_param,
        union lttng_ust_abi_args *uargs,
-       struct lttng_ctx **ctx, struct lttng_session *session)
+       struct lttng_ust_ctx **ctx, struct lttng_ust_session *session)
 {
        return lttng_attach_context(context_param, uargs, ctx, session);
 }
@@ -442,14 +442,14 @@ int lttng_abi_map_channel(int session_objd,
                union lttng_ust_abi_args *uargs,
                void *owner)
 {
-       struct lttng_session *session = objd_private(session_objd);
+       struct lttng_ust_session *session = objd_private(session_objd);
        const char *transport_name;
        const struct lttng_transport *transport;
        const char *chan_name;
        int chan_objd;
        struct lttng_ust_shm_handle *channel_handle;
        struct lttng_channel *lttng_chan;
-       struct channel *chan;
+       struct lttng_ust_lib_ring_buffer_channel *chan;
        struct lttng_ust_lib_ring_buffer_config *config;
        void *chan_data;
        int wakeup_fd;
@@ -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);
@@ -597,7 +597,7 @@ static
 long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
        union lttng_ust_abi_args *uargs, void *owner)
 {
-       struct lttng_session *session = objd_private(objd);
+       struct lttng_ust_session *session = objd_private(objd);
 
        switch (cmd) {
        case LTTNG_UST_ABI_CHANNEL:
@@ -633,7 +633,7 @@ long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
 static
 int lttng_release_session(int objd)
 {
-       struct lttng_session *session = objd_private(objd);
+       struct lttng_ust_session *session = objd_private(objd);
 
        if (session) {
                lttng_session_destroy(session);
@@ -762,7 +762,7 @@ long lttng_event_notifier_group_error_counter_cmd(int objd, unsigned int cmd, un
        return ret;
 }
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 int lttng_release_event_notifier_group_error_counter(int objd)
 {
        struct lttng_counter *counter = objd_private(objd);