Cleanup: sock is never used by ask_channel()

[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 b26cc19f923d23da7806be92069c395b7a99aaa3..791d38d91f6f05a4b154560b3a290d7e97c3d025 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -407,9 +407,7 @@ error_shm_open:
        return -1;
 }
 
-static int open_ust_stream_fd(struct lttng_consumer_channel *channel,
-               struct ustctl_consumer_channel_attr *attr,
-               int cpu)
+static int open_ust_stream_fd(struct lttng_consumer_channel *channel, int cpu)
 {
        char shm_path[PATH_MAX];
        int ret;
@@ -464,7 +462,7 @@ static int create_ust_channel(struct lttng_consumer_channel *channel,
                goto error_alloc;
        }
        for (i = 0; i < nr_stream_fds; i++) {
-               stream_fds[i] = open_ust_stream_fd(channel, attr, i);
+               stream_fds[i] = open_ust_stream_fd(channel, i);
                if (stream_fds[i] < 0) {
                        ret = -1;
                        goto error_open;
@@ -540,11 +538,11 @@ error:
 }
 
 /*
- * Send channel to sessiond.
+ * Send channel to sessiond and relayd if applicable.
  *
  * Return 0 on success or else a negative value.
  */
-static int send_sessiond_channel(int sock,
+static int send_channel_to_sessiond_and_relayd(int sock,
                struct lttng_consumer_channel *channel,
                struct lttng_consumer_local_data *ctx, int *relayd_error)
 {
@@ -564,6 +562,8 @@ static int send_sessiond_channel(int sock,
                        health_code_update();
 
                        /* Try to send the stream to the relayd if one is available. */
+                       DBG("Sending stream %" PRIu64 " of channel \"%s\" to relayd",
+                                       stream->key, channel->name);
                        ret = consumer_send_relayd_stream(stream, stream->chan->pathname);
                        if (ret < 0) {
                                /*
@@ -639,7 +639,7 @@ error:
  * Return 0 on success or else, a negative value is returned and the channel
  * MUST be destroyed by consumer_del_channel().
  */
-static int ask_channel(struct lttng_consumer_local_data *ctx, int sock,
+static int ask_channel(struct lttng_consumer_local_data *ctx,
                struct lttng_consumer_channel *channel,
                struct ustctl_consumer_channel_attr *attr)
 {
@@ -1492,7 +1492,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
                health_code_update();
 
-               ret = ask_channel(ctx, sock, channel, &attr);
+               ret = ask_channel(ctx, channel, &attr);
                if (ret < 0) {
                        goto end_channel_error;
                }
@@ -1577,8 +1577,9 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
                health_code_update();
 
-               /* Send everything to sessiond. */
-               ret = send_sessiond_channel(sock, channel, ctx, &relayd_err);
+               /* Send the channel to sessiond (and relayd, if applicable). */
+               ret = send_channel_to_sessiond_and_relayd(sock, channel, ctx,
+                               &relayd_err);
                if (ret < 0) {
                        if (relayd_err) {
                                /*