struct lttng_channel: split protocol ABI from instrumentation ABI

[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 38de2259fd585eda8417b85446d79c624795c6ca..a1903451478c94ecdbe772f51d672b080d1ddc81 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -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,15 @@ 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;
+       struct lttng_transport *transport;
        const char *chan_name;
        int chan_objd;
        struct lttng_ust_shm_handle *channel_handle;
+       struct lttng_ust_abi_channel_config *lttng_chan_config;
        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;
@@ -475,6 +476,12 @@ int lttng_abi_map_channel(int session_objd,
                goto active;    /* Refuse to add channel to active session */
        }
 
+       lttng_chan = zmalloc(sizeof(struct lttng_channel));
+       if (!lttng_chan) {
+               ret = -ENOMEM;
+               goto lttng_chan_error;
+       }
+
        channel_handle = channel_handle_create(chan_data, len, wakeup_fd);
        if (!channel_handle) {
                ret = -EINVAL;
@@ -489,8 +496,8 @@ int lttng_abi_map_channel(int session_objd,
        assert(chan);
        chan->handle = channel_handle;
        config = &chan->backend.config;
-       lttng_chan = channel_get_private(chan);
-       if (!lttng_chan) {
+       lttng_chan_config = channel_get_private_config(chan);
+       if (!lttng_chan_config) {
                ret = -EINVAL;
                goto alloc_error;
        }
@@ -522,7 +529,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);
@@ -550,6 +557,10 @@ int lttng_abi_map_channel(int session_objd,
        lttng_chan->header_type = 0;
        lttng_chan->handle = channel_handle;
        lttng_chan->type = type;
+       /* Copy fields from lttng ust chan config. */
+       lttng_chan->id = lttng_chan_config->id;
+       memcpy(lttng_chan->uuid, lttng_chan_config->uuid, LTTNG_UST_UUID_LEN);
+       channel_set_private(chan, lttng_chan);
 
        /*
         * We tolerate no failure path after channel creation. It will stay
@@ -566,9 +577,12 @@ objd_error:
 notransport:
 alloc_error:
        channel_destroy(chan, channel_handle, 0);
+       free(lttng_chan);
        return ret;
 
 handle_error:
+       free(lttng_chan);
+lttng_chan_error:
 active:
 invalid:
        return ret;
@@ -597,7 +611,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 +647,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);
@@ -1227,7 +1241,7 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
        case LTTNG_UST_ABI_DISABLE:
                return lttng_channel_disable(channel);
        case LTTNG_UST_ABI_FLUSH_BUFFER:
-               return channel->ops->flush_buffer(channel->chan, channel->handle);
+               return channel->ops->priv->flush_buffer(channel->chan, channel->handle);
        default:
                return -EINVAL;
        }