Fix: liblttng-ust-fork Makefile flags mismatch

[lttng-ust.git] / liblttng-ust-ctl / ustctl.c

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 9789413f2a4ce8c1b3737e4a43157a2a1aa68b8b..d443a2978db76d67d96fcb21b0e0353e60c2b0c2 100644 (file)
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -51,9 +51,8 @@ int ustctl_release_handle(int sock, int handle)
                lum.handle = handle;
                lum.cmd = LTTNG_UST_RELEASE;
                ret = ustcomm_send_app_cmd(sock, &lum, &lur);
-               if (ret < 0) {
+               if (ret)
                        return ret;
-               }
        }
        return 0;
 }
@@ -71,12 +70,14 @@ int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
        if (data->shm_fd >= 0) {
                ret = close(data->shm_fd);
                if (ret < 0) {
+                       ret = -errno;
                        return ret;
                }
        }
        if (data->wait_fd >= 0) {
                ret = close(data->wait_fd);
                if (ret < 0) {
+                       ret = -errno;
                        return ret;
                }
        }
@@ -99,14 +100,7 @@ int ustctl_register_done(int sock)
        ret = ustcomm_send_app_cmd(sock, &lum, &lur);
        if (ret)
                return ret;
-       if (lur.ret_code != USTCOMM_OK) {
-               DBG("Return code: %s", ustcomm_get_readable_code(lur.ret_code));
-               goto error;
-       }
        return 0;
-
-error:
-       return -1;
 }
 
 /*
@@ -162,17 +156,13 @@ int ustctl_open_metadata(int sock, int session_handle,
                free(metadata_data);
                return ret;
        }
-       if (lur.ret_code != USTCOMM_OK) {
-               free(metadata_data);
-               return lur.ret_code;
-       }
        metadata_data->handle = lur.ret_val;
        DBG("received metadata handle %u", metadata_data->handle);
        metadata_data->memory_map_size = lur.u.channel.memory_map_size;
        /* get shm fd */
        ret = ustcomm_recv_fd(sock);
        if (ret < 0)
-               err = 1;
+               err = ret;
        else
                metadata_data->shm_fd = ret;
        /*
@@ -182,7 +172,7 @@ int ustctl_open_metadata(int sock, int session_handle,
        /* get wait fd */
        ret = ustcomm_recv_fd(sock);
        if (ret < 0)
-               err = 1;
+               err = ret;
        else
                metadata_data->wait_fd = ret;
        if (err)
@@ -193,7 +183,7 @@ int ustctl_open_metadata(int sock, int session_handle,
 error:
        (void) ustctl_release_object(sock, metadata_data);
        free(metadata_data);
-       return -EINVAL;
+       return err;
 }
 
 int ustctl_create_channel(int sock, int session_handle,
@@ -227,17 +217,13 @@ int ustctl_create_channel(int sock, int session_handle,
                free(channel_data);
                return ret;
        }
-       if (lur.ret_code != USTCOMM_OK) {
-               free(channel_data);
-               return lur.ret_code;
-       }
        channel_data->handle = lur.ret_val;
        DBG("received channel handle %u", channel_data->handle);
        channel_data->memory_map_size = lur.u.channel.memory_map_size;
        /* get shm fd */
        ret = ustcomm_recv_fd(sock);
        if (ret < 0)
-               err = 1;
+               err = ret;
        else
                channel_data->shm_fd = ret;
        /*
@@ -247,7 +233,7 @@ int ustctl_create_channel(int sock, int session_handle,
        /* get wait fd */
        ret = ustcomm_recv_fd(sock);
        if (ret < 0)
-               err = 1;
+               err = ret;
        else
                channel_data->wait_fd = ret;
        if (err)
@@ -258,13 +244,14 @@ int ustctl_create_channel(int sock, int session_handle,
 error:
        (void) ustctl_release_object(sock, channel_data);
        free(channel_data);
-       return -EINVAL;
+       return err;
 }
 
 /*
- * Return -ENOENT if no more stream is available for creation.
+ * Return -LTTNG_UST_ERR_NOENT if no more stream is available for creation.
  * Return 0 on success.
- * Return negative error value on error.
+ * Return negative error value on system error.
+ * Return positive error value on UST error.
  */
 int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
                struct lttng_ust_object_data **_stream_data)
@@ -289,18 +276,13 @@ int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
                free(stream_data);
                return ret;
        }
-       if (lur.ret_code != USTCOMM_OK) {
-               free(stream_data);
-               return lur.ret_code;
-       }
-
        stream_data->handle = lur.ret_val;
        DBG("received stream handle %u", stream_data->handle);
        stream_data->memory_map_size = lur.u.stream.memory_map_size;
        /* get shm fd */
        fd = ustcomm_recv_fd(sock);
        if (fd < 0)
-               err = 1;
+               err = fd;
        else
                stream_data->shm_fd = fd;
        /*
@@ -310,7 +292,7 @@ int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
        /* get wait fd */
        fd = ustcomm_recv_fd(sock);
        if (fd < 0)
-               err = 1;
+               err = fd;
        else
                stream_data->wait_fd = fd;
        if (err)
@@ -321,7 +303,7 @@ int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
 error:
        (void) ustctl_release_object(sock, stream_data);
        free(stream_data);
-       return -EINVAL;
+       return err;
 }
 
 int ustctl_create_event(int sock, struct lttng_ust_event *ev,
@@ -390,6 +372,39 @@ int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
        return ret;
 }
 
+int ustctl_set_filter(int sock, struct lttng_ust_filter_bytecode *bytecode,
+               struct lttng_ust_object_data *obj_data)
+{
+       struct ustcomm_ust_msg lum;
+       struct ustcomm_ust_reply lur;
+       int ret;
+
+       if (!obj_data)
+               return -EINVAL;
+
+       memset(&lum, 0, sizeof(lum));
+       lum.handle = obj_data->handle;
+       lum.cmd = LTTNG_UST_FILTER;
+       lum.u.filter.data_size = bytecode->len;
+       lum.u.filter.reloc_offset = bytecode->reloc_offset;
+       lum.u.filter.seqnum = bytecode->seqnum;
+
+       ret = ustcomm_send_app_msg(sock, &lum);
+       if (ret)
+               return ret;
+       /* send var len bytecode */
+       ret = ustcomm_send_unix_sock(sock, bytecode->data,
+                               bytecode->len);
+       if (ret < 0) {
+               if (ret == -ECONNRESET)
+                       fprintf(stderr, "remote end closed connection\n");
+               return ret;
+       }
+       if (ret != bytecode->len)
+               return -EINVAL;
+       return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+}
+
 /* Enable event, channel and session ioctl */
 int ustctl_enable(int sock, struct lttng_ust_object_data *object)
 {
@@ -520,10 +535,6 @@ int ustctl_tracepoint_field_list_get(int sock, int tp_field_list_handle,
        ret = ustcomm_send_app_cmd(sock, &lum, &lur);
        if (ret)
                return ret;
-       if (lur.ret_code != USTCOMM_OK) {
-               DBG("Return code: %s", ustcomm_get_readable_code(lur.ret_code));
-               return -EINVAL;
-       }
        len = ustcomm_recv_unix_sock(sock, iter, sizeof(*iter));
        if (len != sizeof(*iter)) {
                return -EINVAL;
@@ -674,6 +685,7 @@ struct lttng_ust_shm_handle *ustctl_map_channel(struct lttng_ust_object_data *ch
        default:
                ERR("Unknown client type %d", config->client_type);
                channel_destroy(chan, handle, 1);
+               free(handle->shadow_chan);
                return NULL;
        }
        /* Replace the object table pointer. */
@@ -724,6 +736,7 @@ void ustctl_unmap_channel(struct lttng_ust_shm_handle *handle)
        assert(handle);
        chan = shmp(handle, handle->chan);
        channel_destroy(chan, handle, 1);
+       free(handle->shadow_chan);
 }
 
 /*
@@ -732,7 +745,7 @@ void ustctl_unmap_channel(struct lttng_ust_shm_handle *handle)
 struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_handle *handle,
        int cpu)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
        int *shm_fd, *wait_fd;
        uint64_t *memory_map_size;
        struct lttng_ust_lib_ring_buffer *buf;
@@ -741,6 +754,7 @@ struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_h
        if (!handle)
                return NULL;
 
+       chan = handle->shadow_chan;
        buf = channel_get_ring_buffer(&chan->backend.config,
                chan, cpu, handle, &shm_fd, &wait_fd, &memory_map_size);
        if (!buf)
@@ -784,11 +798,12 @@ int ustctl_get_mmap_len(struct lttng_ust_shm_handle *handle,
                unsigned long *len)
 {
        unsigned long mmap_buf_len;
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
 
        if (!handle || !buf || !len)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        if (chan->backend.config.output != RING_BUFFER_MMAP)
                return -EINVAL;
        mmap_buf_len = chan->backend.buf_size;
@@ -805,11 +820,12 @@ int ustctl_get_max_subbuf_size(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf,
                unsigned long *len)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
 
        if (!handle || !buf || !len)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        *len = chan->backend.subbuf_size;
        return 0;
 }
@@ -823,12 +839,13 @@ int ustctl_get_max_subbuf_size(struct lttng_ust_shm_handle *handle,
 int ustctl_get_mmap_read_offset(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf, unsigned long *off)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
        unsigned long sb_bindex;
 
        if (!handle || !buf || !off)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        if (chan->backend.config.output != RING_BUFFER_MMAP)
                return -EINVAL;
        sb_bindex = subbuffer_id_get_index(&chan->backend.config,
@@ -841,11 +858,12 @@ int ustctl_get_mmap_read_offset(struct lttng_ust_shm_handle *handle,
 int ustctl_get_subbuf_size(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
 
        if (!handle || !buf || !len)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        *len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
                handle);
        return 0;
@@ -855,11 +873,12 @@ int ustctl_get_subbuf_size(struct lttng_ust_shm_handle *handle,
 int ustctl_get_padded_subbuf_size(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
 
        if (!handle || !buf || !len)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        *len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
                handle);
        *len = PAGE_ALIGN(*len);