Fix: comparison of unsigned enum expression >= 0

[lttng-tools.git] / src / common / ust-consumer / ust-consumer.c

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index b5dfa5e74a34106c00fc7bfc8c364c2bcba3d8f6..6e7e1679476c742cfd2b71c3454ecf2c348d5fed 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -192,8 +192,20 @@ static int send_stream_to_thread(struct lttng_consumer_stream *stream,
 
        /* Get the right pipe where the stream will be sent. */
        if (stream->metadata_flag) {
+               ret = consumer_add_metadata_stream(stream);
+               if (ret) {
+                       ERR("Consumer add metadata stream %" PRIu64 " failed.",
+                                       stream->key);
+                       goto error;
+               }
                stream_pipe = ctx->consumer_metadata_pipe;
        } else {
+               ret = consumer_add_data_stream(stream);
+               if (ret) {
+                       ERR("Consumer add stream %" PRIu64 " failed.",
+                                       stream->key);
+                       goto error;
+               }
                stream_pipe = ctx->consumer_data_pipe;
        }
 
@@ -202,8 +214,13 @@ static int send_stream_to_thread(struct lttng_consumer_stream *stream,
                ERR("Consumer write %s stream to pipe %d",
                                stream->metadata_flag ? "metadata" : "data",
                                lttng_pipe_get_writefd(stream_pipe));
+               if (stream->metadata_flag) {
+                       consumer_del_stream_for_metadata(stream);
+               } else {
+                       consumer_del_stream_for_data(stream);
+               }
        }
-
+error:
        return ret;
 }
 
@@ -542,6 +559,8 @@ static int send_streams_to_thread(struct lttng_consumer_channel *channel,
                         * If we are unable to send the stream to the thread, there is
                         * a big problem so just stop everything.
                         */
+                       /* Remove node from the channel stream list. */
+                       cds_list_del(&stream->send_node);
                        goto error;
                }
 
@@ -1577,14 +1596,14 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
                goto end;
        }
 
-       ret_code = lttng_ustconsumer_recv_metadata(ctx->consumer_metadata_socket,
+       ret = lttng_ustconsumer_recv_metadata(ctx->consumer_metadata_socket,
                        key, offset, len, channel, timer);
-       if (ret_code >= 0) {
+       if (ret >= 0) {
                /*
                 * Only send the status msg if the sessiond is alive meaning a positive
                 * ret code.
                 */
-               (void) consumer_send_status_msg(ctx->consumer_metadata_socket, ret_code);
+               (void) consumer_send_status_msg(ctx->consumer_metadata_socket, ret);
        }
        ret = 0;