Fix kconsumerd number of fd expected

[lttng-tools.git] / ltt-sessiond / main.c

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 5fec7ae4e8cc2f3070ad5e151cd40d9d8a2c857d..ddf5acd2f116664b2777421338033a0c64fc0aa4 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -417,13 +417,11 @@ static int send_consumer_channel_streams(struct consumer_data *consumer_data,
                int sock, struct ltt_kernel_channel *channel)
 {
        int ret;
-       size_t nb_fd;
        struct ltt_kernel_stream *stream;
        struct lttcomm_consumer_msg lkm;
 
        DBG("Sending streams of channel %s to kernel consumer",
                        channel->channel->name);
-       nb_fd = channel->stream_count;
 
        /* Send channel */
        lkm.cmd_type = LTTNG_CONSUMER_ADD_CHANNEL;
@@ -1100,7 +1098,7 @@ static void *thread_dispatch_ust_registration(void *data)
                        /* Dequeue command for registration */
                        node = cds_wfq_dequeue_blocking(&ust_cmd_queue.queue);
                        if (node == NULL) {
-                               DBG("Waked up but nothing in the UST command queue");
+                               DBG("Woken up but nothing in the UST command queue");
                                /* Continue thread execution */
                                break;
                        }
@@ -3057,7 +3055,7 @@ static void *thread_manage_clients(void *data)
 
                DBG("Sending response (size: %d, retcode: %s)",
                                cmd_ctx->lttng_msg_size,
-                               lttng_get_readable_code(-cmd_ctx->llm->ret_code));
+                               lttng_strerror(-cmd_ctx->llm->ret_code));
                ret = send_unix_sock(sock, cmd_ctx->llm, cmd_ctx->lttng_msg_size);
                if (ret < 0) {
                        ERR("Failed to send data back to client");