Move completed trace archive chunks to an "archives" sub-folder

[lttng-tools.git] / src / bin / lttng-sessiond / client.c

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index 8cf28a9d6323b4859b9563a374422be5489a7484..fb50b3cc614eaecdf4aacfa9acabb3ad88c1d604 100644 (file)
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -81,6 +81,7 @@ static int setup_lttng_msg(struct command_ctx *cmd_ctx,
        const size_t payload_offset = cmd_header_offset + cmd_header_len;
        const size_t total_msg_size = header_len + cmd_header_len + payload_len;
 
+       free(cmd_ctx->llm);
        cmd_ctx->llm = zmalloc(total_msg_size);
 
        if (cmd_ctx->llm == NULL) {
@@ -475,7 +476,7 @@ static int create_kernel_session(struct ltt_session *session)
        ret = kernel_create_session(session, kernel_tracer_fd);
        if (ret < 0) {
                ret = LTTNG_ERR_KERN_SESS_FAIL;
-               goto error;
+               goto error_create;
        }
 
        /* Code flow safety */
@@ -497,6 +498,7 @@ static int create_kernel_session(struct ltt_session *session)
 error:
        trace_kernel_destroy_session(session->kernel_session);
        session->kernel_session = NULL;
+error_create:
        return ret;
 }
 
@@ -884,7 +886,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
                if (need_tracing_session) {
                        if (cmd_ctx->session->kernel_session == NULL) {
                                ret = create_kernel_session(cmd_ctx->session);
-                               if (ret < 0) {
+                               if (ret != LTTNG_OK) {
                                        ret = LTTNG_ERR_KERN_SESS_FAIL;
                                        goto error;
                                }