Refactoring: use an opaque lttng_tracker_id type
[lttng-tools.git] / src / bin / lttng-sessiond / client.c
index ea8ffd45fc066c3cfa16b4ac8017400361888e8d..2c7bd4787c9371305455dfa7765ab9397d07877f 100644 (file)
@@ -26,6 +26,8 @@
 #include <common/utils.h>
 #include <lttng/userspace-probe-internal.h>
 #include <lttng/event-internal.h>
+#include <lttng/session-internal.h>
+#include <lttng/session-descriptor-internal.h>
 
 #include "client.h"
 #include "lttng-sessiond.h"
 #include "testpoint.h"
 #include "utils.h"
 #include "manage-consumer.h"
+#include "clear.h"
 
 static bool is_root;
 
 static struct thread_state {
-       pthread_cond_t cond;
-       pthread_mutex_t lock;
-       bool is_running;
-} thread_state = {
-       .cond = PTHREAD_COND_INITIALIZER,
-       .lock = PTHREAD_MUTEX_INITIALIZER,
-       .is_running = false
-};
-
-void set_thread_state_running(void)
+       sem_t ready;
+       bool running;
+       int client_sock;
+} thread_state;
+
+static void set_thread_status(bool running)
 {
-       pthread_mutex_lock(&thread_state.lock);
-        thread_state.is_running = true;
-       pthread_cond_broadcast(&thread_state.cond);
-       pthread_mutex_unlock(&thread_state.lock);
+       DBG("Marking client thread's state as %s", running ? "running" : "error");
+       thread_state.running = running;
+       sem_post(&thread_state.ready);
 }
 
-static void wait_thread_state_running(void)
+static bool wait_thread_status(void)
 {
-       pthread_mutex_lock(&thread_state.lock);
-       while (!thread_state.is_running) {
-               pthread_cond_wait(&thread_state.cond,
-                               &thread_state.lock);
+       DBG("Waiting for client thread to be ready");
+       sem_wait(&thread_state.ready);
+       if (thread_state.running) {
+               DBG("Client thread is ready");
+       } else {
+               ERR("Initialization of client thread failed");
        }
-       pthread_mutex_unlock(&thread_state.lock);
+
+       return thread_state.running;
 }
 
 /*
@@ -84,6 +85,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) {
@@ -391,10 +393,13 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
        }
 
        /* Append correct directory to subdir */
-       strncat(consumer->subdir, dir_name,
-                       sizeof(consumer->subdir) - strlen(consumer->subdir) - 1);
-       DBG3("Copy session consumer subdir %s", consumer->subdir);
-
+       ret = lttng_strncpy(consumer->domain_subdir, dir_name,
+                       sizeof(consumer->domain_subdir));
+       if (ret) {
+               ret = LTTNG_ERR_UNK;
+               goto error;
+       }
+       DBG3("Copy session consumer subdir %s", consumer->domain_subdir);
        ret = LTTNG_OK;
 
 error:
@@ -407,7 +412,7 @@ error:
  * Should *NOT* be called with RCU read-side lock held.
  */
 static int create_ust_session(struct ltt_session *session,
-               struct lttng_domain *domain)
+               const struct lttng_domain *domain)
 {
        int ret;
        struct ltt_ust_session *lus = NULL;
@@ -475,10 +480,10 @@ static int create_kernel_session(struct ltt_session *session)
 
        DBG("Creating kernel session");
 
-       ret = kernel_create_session(session, kernel_tracer_fd);
+       ret = kernel_create_session(session);
        if (ret < 0) {
                ret = LTTNG_ERR_KERN_SESS_FAIL;
-               goto error;
+               goto error_create;
        }
 
        /* Code flow safety */
@@ -500,6 +505,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;
 }
 
@@ -702,10 +708,12 @@ static int send_unix_sock(int sock, void *buf, size_t len)
  * Return any error encountered or 0 for success.
  *
  * "sock" is only used for special-case var. len data.
+ * A command may assume the ownership of the socket, in which case its value
+ * should be set to -1.
  *
  * Should *NOT* be called with RCU read-side lock held.
  */
-static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
+static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
                int *sock_error)
 {
        int ret = LTTNG_OK;
@@ -719,9 +727,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
        *sock_error = 0;
 
        switch (cmd_ctx->lsm->cmd_type) {
-       case LTTNG_CREATE_SESSION:
-       case LTTNG_CREATE_SESSION_SNAPSHOT:
-       case LTTNG_CREATE_SESSION_LIVE:
+       case LTTNG_CREATE_SESSION_EXT:
        case LTTNG_DESTROY_SESSION:
        case LTTNG_LIST_SESSIONS:
        case LTTNG_LIST_DOMAINS:
@@ -742,6 +748,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
        case LTTNG_ROTATION_GET_INFO:
        case LTTNG_ROTATION_SET_SCHEDULE:
        case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
+       case LTTNG_CLEAR_SESSION:
                need_domain = 0;
                break;
        default:
@@ -782,7 +789,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
        case LTTNG_LIST_CHANNELS:
        case LTTNG_LIST_EVENTS:
        case LTTNG_LIST_SYSCALLS:
-       case LTTNG_LIST_TRACKER_PIDS:
+       case LTTNG_LIST_TRACKER_IDS:
        case LTTNG_DATA_PENDING:
        case LTTNG_ROTATE_SESSION:
        case LTTNG_ROTATION_GET_INFO:
@@ -799,9 +806,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 
        /* Commands that DO NOT need a session. */
        switch (cmd_ctx->lsm->cmd_type) {
-       case LTTNG_CREATE_SESSION:
-       case LTTNG_CREATE_SESSION_SNAPSHOT:
-       case LTTNG_CREATE_SESSION_LIVE:
+       case LTTNG_CREATE_SESSION_EXT:
        case LTTNG_LIST_SESSIONS:
        case LTTNG_LIST_TRACEPOINTS:
        case LTTNG_LIST_SYSCALLS:
@@ -877,6 +882,15 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
                        goto error;
                }
 
+               /* Kernel tracer check */
+               if (!kernel_tracer_is_initialized()) {
+                       /* Basically, load kernel tracer modules */
+                       ret = init_kernel_tracer();
+                       if (ret != 0) {
+                               goto error;
+                       }
+               }
+
                /* Consumer is in an ERROR state. Report back to client */
                if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) {
                        ret = LTTNG_ERR_NO_KERNCONSUMERD;
@@ -887,7 +901,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;
                                }
@@ -939,7 +953,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
                        /* Create UST session if none exist. */
                        if (cmd_ctx->session->ust_session == NULL) {
                                ret = create_ust_session(cmd_ctx->session,
-                                               &cmd_ctx->lsm->domain);
+                                               ALIGNED_CONST_PTR(cmd_ctx->lsm->domain));
                                if (ret != LTTNG_OK) {
                                        goto error;
                                }
@@ -1108,13 +1122,13 @@ skip_domain:
                        cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name =
                                        context_name;
 
-                       ret = lttcomm_recv_unix_sock(sock, provider_name,
+                       ret = lttcomm_recv_unix_sock(*sock, provider_name,
                                        provider_name_len);
                        if (ret < 0) {
                                goto error_add_context;
                        }
 
-                       ret = lttcomm_recv_unix_sock(sock, context_name,
+                       ret = lttcomm_recv_unix_sock(*sock, context_name,
                                        context_name_len);
                        if (ret < 0) {
                                goto error_add_context;
@@ -1128,7 +1142,7 @@ skip_domain:
                ret = cmd_add_context(cmd_ctx->session,
                                cmd_ctx->lsm->domain.type,
                                cmd_ctx->lsm->u.context.channel_name,
-                               &cmd_ctx->lsm->u.context.ctx,
+                               ALIGNED_CONST_PTR(cmd_ctx->lsm->u.context.ctx),
                                kernel_poll_pipe[1]);
 
                cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name = NULL;
@@ -1167,7 +1181,7 @@ error_add_context:
 
                        DBG("Discarding disable event command payload of size %zu", count);
                        while (count) {
-                               ret = lttcomm_recv_unix_sock(sock, data,
+                               ret = lttcomm_recv_unix_sock(*sock, data,
                                        count > sizeof(data) ? sizeof(data) : count);
                                if (ret < 0) {
                                        goto error;
@@ -1176,33 +1190,156 @@ error_add_context:
                                count -= (size_t) ret;
                        }
                }
-               /* FIXME: passing packed structure to non-packed pointer */
                ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
                                cmd_ctx->lsm->u.disable.channel_name,
-                               &cmd_ctx->lsm->u.disable.event);
+                               ALIGNED_CONST_PTR(cmd_ctx->lsm->u.disable.event));
                break;
        }
        case LTTNG_ENABLE_CHANNEL:
        {
                cmd_ctx->lsm->u.channel.chan.attr.extended.ptr =
                                (struct lttng_channel_extended *) &cmd_ctx->lsm->u.channel.extended;
-               ret = cmd_enable_channel(cmd_ctx->session, &cmd_ctx->lsm->domain,
-                               &cmd_ctx->lsm->u.channel.chan,
+               ret = cmd_enable_channel(cmd_ctx->session,
+                               ALIGNED_CONST_PTR(cmd_ctx->lsm->domain),
+                               ALIGNED_CONST_PTR(cmd_ctx->lsm->u.channel.chan),
                                kernel_poll_pipe[1]);
                break;
        }
-       case LTTNG_TRACK_PID:
+       case LTTNG_TRACK_ID:
        {
-               ret = cmd_track_pid(cmd_ctx->session,
-                               cmd_ctx->lsm->domain.type,
-                               cmd_ctx->lsm->u.pid_tracker.pid);
+               struct lttng_tracker_id *id = NULL;
+               enum lttng_tracker_id_status status;
+
+               id = lttng_tracker_id_create();
+               if (!id) {
+                       ret = LTTNG_ERR_NOMEM;
+                       goto error;
+               }
+
+               switch (cmd_ctx->lsm->u.id_tracker.id_type) {
+               case LTTNG_ID_ALL:
+                       status = lttng_tracker_id_set_all(id);
+                       break;
+               case LTTNG_ID_VALUE:
+                       status = lttng_tracker_id_set_value(
+                                       id, cmd_ctx->lsm->u.id_tracker.u.value);
+                       break;
+               case LTTNG_ID_STRING:
+               {
+                       const size_t var_len = cmd_ctx->lsm->u.id_tracker.u.var_len;
+                       char *string = NULL;
+
+                       string = zmalloc(var_len);
+                       if (!string) {
+                               lttng_tracker_id_destroy(id);
+                               ret = LTTNG_ERR_NOMEM;
+                               goto error;
+                       }
+                       DBG("Receiving var len tracker id string from client");
+                       ret = lttcomm_recv_unix_sock(*sock, string, var_len);
+                       if (ret <= 0) {
+                               DBG("Nothing received");
+                               *sock_error = 1;
+                               free(string);
+                               lttng_tracker_id_destroy(id);
+                               ret = LTTNG_ERR_INVALID;
+                               goto error;
+                       }
+                       if (strnlen(string, var_len) != var_len - 1) {
+                               DBG("String received as tracker ID is not NULL-terminated");
+                               free(string);
+                               lttng_tracker_id_destroy(id);
+                               ret = LTTNG_ERR_INVALID;
+                               goto error;
+                       }
+
+                       status = lttng_tracker_id_set_string(id, string);
+                       free(string);
+                       break;
+               }
+               default:
+                       lttng_tracker_id_destroy(id);
+                       ret = LTTNG_ERR_INVALID;
+                       goto error;
+               }
+
+               if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+                       ERR("Invalid value for tracker id");
+                       ret = LTTNG_ERR_INVALID;
+                       lttng_tracker_id_destroy(id);
+                       goto error;
+               }
+
+               ret = cmd_track_id(cmd_ctx->session,
+                               cmd_ctx->lsm->u.id_tracker.tracker_type,
+                               cmd_ctx->lsm->domain.type, id);
+               lttng_tracker_id_destroy(id);
                break;
        }
-       case LTTNG_UNTRACK_PID:
+       case LTTNG_UNTRACK_ID:
        {
-               ret = cmd_untrack_pid(cmd_ctx->session,
-                               cmd_ctx->lsm->domain.type,
-                               cmd_ctx->lsm->u.pid_tracker.pid);
+               struct lttng_tracker_id *id = NULL;
+               enum lttng_tracker_id_status status;
+
+               id = lttng_tracker_id_create();
+
+               switch (cmd_ctx->lsm->u.id_tracker.id_type) {
+               case LTTNG_ID_ALL:
+                       status = lttng_tracker_id_set_all(id);
+                       break;
+               case LTTNG_ID_VALUE:
+                       status = lttng_tracker_id_set_value(
+                                       id, cmd_ctx->lsm->u.id_tracker.u.value);
+                       break;
+               case LTTNG_ID_STRING:
+               {
+                       const size_t var_len = cmd_ctx->lsm->u.id_tracker.u.var_len;
+                       char *string = NULL;
+
+                       string = zmalloc(var_len);
+                       if (!string) {
+                               ret = LTTNG_ERR_NOMEM;
+                               lttng_tracker_id_destroy(id);
+                               goto error;
+                       }
+                       DBG("Receiving var len tracker id string from client");
+                       ret = lttcomm_recv_unix_sock(*sock, string, var_len);
+                       if (ret <= 0) {
+                               DBG("Nothing received");
+                               *sock_error = 1;
+                               lttng_tracker_id_destroy(id);
+                               free(string);
+                               ret = LTTNG_ERR_INVALID;
+                               goto error;
+                       }
+                       if (strnlen(string, var_len) != var_len - 1) {
+                               DBG("String received as tracker ID is not NULL-terminated");
+                               lttng_tracker_id_destroy(id);
+                               free(string);
+                               ret = LTTNG_ERR_INVALID;
+                               goto error;
+                       }
+                       status = lttng_tracker_id_set_string(id, string);
+                       free(string);
+                       break;
+               }
+               default:
+                       lttng_tracker_id_destroy(id);
+                       ret = LTTNG_ERR_INVALID;
+                       goto error;
+               }
+
+               if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+                       ERR("Invalid tracker id");
+                       lttng_tracker_id_destroy(id);
+                       ret = LTTNG_ERR_INVALID;
+                       goto error;
+               }
+
+               ret = cmd_untrack_id(cmd_ctx->session,
+                               cmd_ctx->lsm->u.id_tracker.tracker_type,
+                               cmd_ctx->lsm->domain.type, id);
+               lttng_tracker_id_destroy(id);
                break;
        }
        case LTTNG_ENABLE_EVENT:
@@ -1225,7 +1362,7 @@ error_add_context:
 
                        DBG("Receiving var len exclusion event list from client ...");
                        exclusion->count = count;
-                       ret = lttcomm_recv_unix_sock(sock, exclusion->names,
+                       ret = lttcomm_recv_unix_sock(*sock, exclusion->names,
                                        count * LTTNG_SYMBOL_NAME_LEN);
                        if (ret <= 0) {
                                DBG("Nothing recv() from client var len data... continuing");
@@ -1256,7 +1393,7 @@ error_add_context:
 
                        /* Receive var. len. data */
                        DBG("Receiving var len filter's expression from client ...");
-                       ret = lttcomm_recv_unix_sock(sock, filter_expression,
+                       ret = lttcomm_recv_unix_sock(*sock, filter_expression,
                                expression_len);
                        if (ret <= 0) {
                                DBG("Nothing recv() from client var len data... continuing");
@@ -1289,7 +1426,7 @@ error_add_context:
 
                        /* Receive var. len. data */
                        DBG("Receiving var len filter's bytecode from client ...");
-                       ret = lttcomm_recv_unix_sock(sock, bytecode, bytecode_len);
+                       ret = lttcomm_recv_unix_sock(*sock, bytecode, bytecode_len);
                        if (ret <= 0) {
                                DBG("Nothing recv() from client var len data... continuing");
                                *sock_error = 1;
@@ -1309,7 +1446,7 @@ error_add_context:
                        }
                }
 
-               ev = lttng_event_copy(&cmd_ctx->lsm->u.enable.event);
+               ev = lttng_event_copy(ALIGNED_CONST_PTR(cmd_ctx->lsm->u.enable.event));
                if (!ev) {
                        DBG("Failed to copy event: %s",
                                        cmd_ctx->lsm->u.enable.event.name);
@@ -1323,7 +1460,7 @@ error_add_context:
 
                if (cmd_ctx->lsm->u.enable.userspace_probe_location_len > 0) {
                        /* Expect a userspace probe description. */
-                       ret = receive_userspace_probe(cmd_ctx, sock, sock_error, ev);
+                       ret = receive_userspace_probe(cmd_ctx, *sock, sock_error, ev);
                        if (ret) {
                                free(filter_expression);
                                free(bytecode);
@@ -1333,7 +1470,8 @@ error_add_context:
                        }
                }
 
-               ret = cmd_enable_event(cmd_ctx->session, &cmd_ctx->lsm->domain,
+               ret = cmd_enable_event(cmd_ctx->session,
+                               ALIGNED_CONST_PTR(cmd_ctx->lsm->domain),
                                cmd_ctx->lsm->u.enable.channel_name,
                                ev,
                                filter_expression, bytecode, exclusion,
@@ -1427,27 +1565,81 @@ error_add_context:
                ret = LTTNG_OK;
                break;
        }
-       case LTTNG_LIST_TRACKER_PIDS:
+       case LTTNG_LIST_TRACKER_IDS:
        {
-               int32_t *pids = NULL;
-               ssize_t nr_pids;
-
-               nr_pids = cmd_list_tracker_pids(cmd_ctx->session,
-                               cmd_ctx->lsm->domain.type, &pids);
-               if (nr_pids < 0) {
+               struct lttcomm_tracker_command_header cmd_header;
+               struct lttng_tracker_id **ids = NULL;
+               ssize_t nr_ids, i;
+               struct lttng_dynamic_buffer buf;
+
+               nr_ids = cmd_list_tracker_ids(
+                               cmd_ctx->lsm->u.id_tracker.tracker_type,
+                               cmd_ctx->session, cmd_ctx->lsm->domain.type,
+                               &ids);
+               if (nr_ids < 0) {
                        /* Return value is a negative lttng_error_code. */
-                       ret = -nr_pids;
+                       ret = -nr_ids;
                        goto error;
                }
 
-               /*
-                * Setup lttng message with payload size set to the event list size in
-                * bytes and then copy list into the llm payload.
-                */
-               ret = setup_lttng_msg_no_cmd_header(cmd_ctx, pids,
-                       sizeof(int32_t) * nr_pids);
-               free(pids);
+               lttng_dynamic_buffer_init(&buf);
+               for (i = 0; i < nr_ids; i++) {
+                       struct lttng_tracker_id *id = ids[i];
+                       struct lttcomm_tracker_id_header id_hdr;
+                       size_t var_data_len = 0;
+                       enum lttng_tracker_id_status status;
+                       const char *string;
+                       int value;
+
+                       memset(&id_hdr, 0, sizeof(id_hdr));
+                       id_hdr.type = lttng_tracker_id_get_type(id);
+                       switch (id_hdr.type) {
+                       case LTTNG_ID_ALL:
+                               break;
+                       case LTTNG_ID_VALUE:
+                               status = lttng_tracker_id_get_value(id, &value);
+                               id_hdr.u.value = value;
+                               if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+                                       ret = LTTNG_ERR_INVALID;
+                                       goto error_list_tracker;
+                               }
+                               break;
+                       case LTTNG_ID_STRING:
+                               status = lttng_tracker_id_get_string(
+                                               id, &string);
+                               if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+                                       ret = LTTNG_ERR_INVALID;
+                                       goto error_list_tracker;
+                               }
 
+                               id_hdr.u.var_data_len = var_data_len =
+                                               strlen(string) + 1;
+                               break;
+                       default:
+                               ret = LTTNG_ERR_INVALID;
+                               goto error_list_tracker;
+                       }
+                       ret = lttng_dynamic_buffer_append(
+                                       &buf, &id_hdr, sizeof(id_hdr));
+                       if (ret) {
+                               ret = LTTNG_ERR_NOMEM;
+                               goto error_list_tracker;
+                       }
+                       ret = lttng_dynamic_buffer_append(
+                                       &buf, string, var_data_len);
+                       if (ret) {
+                               ret = LTTNG_ERR_NOMEM;
+                               goto error_list_tracker;
+                       }
+               }
+
+               cmd_header.nb_tracker_id = nr_ids;
+               ret = setup_lttng_msg(cmd_ctx, buf.data, buf.size, &cmd_header,
+                               sizeof(cmd_header));
+       error_list_tracker:
+               lttng_tracker_ids_destroy(ids, nr_ids);
+               free(ids);
+               lttng_dynamic_buffer_reset(&buf);
                if (ret < 0) {
                        goto setup_error;
                }
@@ -1476,7 +1668,7 @@ error_add_context:
 
                /* Receive variable len data */
                DBG("Receiving %zu URI(s) from client ...", nb_uri);
-               ret = lttcomm_recv_unix_sock(sock, uris, len);
+               ret = lttcomm_recv_unix_sock(*sock, uris, len);
                if (ret <= 0) {
                        DBG("No URIs received from client... continuing");
                        *sock_error = 1;
@@ -1518,51 +1710,11 @@ error_add_context:
                ret = cmd_stop_trace(cmd_ctx->session);
                break;
        }
-       case LTTNG_CREATE_SESSION:
-       {
-               size_t nb_uri, len;
-               struct lttng_uri *uris = NULL;
-
-               nb_uri = cmd_ctx->lsm->u.uri.size;
-               len = nb_uri * sizeof(struct lttng_uri);
-
-               if (nb_uri > 0) {
-                       uris = zmalloc(len);
-                       if (uris == NULL) {
-                               ret = LTTNG_ERR_FATAL;
-                               goto error;
-                       }
-
-                       /* Receive variable len data */
-                       DBG("Waiting for %zu URIs from client ...", nb_uri);
-                       ret = lttcomm_recv_unix_sock(sock, uris, len);
-                       if (ret <= 0) {
-                               DBG("No URIs received from client... continuing");
-                               *sock_error = 1;
-                               ret = LTTNG_ERR_SESSION_FAIL;
-                               free(uris);
-                               goto error;
-                       }
-
-                       if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
-                               DBG("Creating session with ONE network URI is a bad call");
-                               ret = LTTNG_ERR_SESSION_FAIL;
-                               free(uris);
-                               goto error;
-                       }
-               }
-
-               ret = cmd_create_session_uri(cmd_ctx->lsm->session.name, uris, nb_uri,
-                       &cmd_ctx->creds, 0);
-
-               free(uris);
-
-               break;
-       }
        case LTTNG_DESTROY_SESSION:
        {
                ret = cmd_destroy_session(cmd_ctx->session,
-                               notification_thread_handle);
+                               notification_thread_handle,
+                               sock);
                break;
        }
        case LTTNG_LIST_DOMAINS:
@@ -1653,7 +1805,9 @@ error_add_context:
                nr_sessions = lttng_sessions_count(
                                LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
                                LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
-               payload_len = sizeof(struct lttng_session) * nr_sessions;
+
+               payload_len = (sizeof(struct lttng_session) * nr_sessions) +
+                               (sizeof(struct lttng_session_extended) * nr_sessions);
                sessions_payload = zmalloc(payload_len);
 
                if (!sessions_payload) {
@@ -1662,7 +1816,7 @@ error_add_context:
                        goto setup_error;
                }
 
-               cmd_list_lttng_sessions(sessions_payload,
+               cmd_list_lttng_sessions(sessions_payload, nr_sessions,
                        LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
                        LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
                session_unlock_list();
@@ -1739,13 +1893,16 @@ error_add_context:
        }
        case LTTNG_SNAPSHOT_ADD_OUTPUT:
        {
+               uint32_t snapshot_id;
                struct lttcomm_lttng_output_id reply;
 
                ret = cmd_snapshot_add_output(cmd_ctx->session,
-                               &cmd_ctx->lsm->u.snapshot_output.output, &reply.id);
+                               ALIGNED_CONST_PTR(cmd_ctx->lsm->u.snapshot_output.output),
+                               &snapshot_id);
                if (ret != LTTNG_OK) {
                        goto error;
                }
+               reply.id = snapshot_id;
 
                ret = setup_lttng_msg_no_cmd_header(cmd_ctx, &reply,
                        sizeof(reply));
@@ -1760,7 +1917,7 @@ error_add_context:
        case LTTNG_SNAPSHOT_DEL_OUTPUT:
        {
                ret = cmd_snapshot_del_output(cmd_ctx->session,
-                               &cmd_ctx->lsm->u.snapshot_output.output);
+                               ALIGNED_CONST_PTR(cmd_ctx->lsm->u.snapshot_output.output));
                break;
        }
        case LTTNG_SNAPSHOT_LIST_OUTPUT:
@@ -1789,86 +1946,39 @@ error_add_context:
        case LTTNG_SNAPSHOT_RECORD:
        {
                ret = cmd_snapshot_record(cmd_ctx->session,
-                               &cmd_ctx->lsm->u.snapshot_record.output,
+                               ALIGNED_CONST_PTR(cmd_ctx->lsm->u.snapshot_record.output),
                                cmd_ctx->lsm->u.snapshot_record.wait);
                break;
        }
-       case LTTNG_CREATE_SESSION_SNAPSHOT:
+       case LTTNG_CREATE_SESSION_EXT:
        {
-               size_t nb_uri, len;
-               struct lttng_uri *uris = NULL;
-
-               nb_uri = cmd_ctx->lsm->u.uri.size;
-               len = nb_uri * sizeof(struct lttng_uri);
-
-               if (nb_uri > 0) {
-                       uris = zmalloc(len);
-                       if (uris == NULL) {
-                               ret = LTTNG_ERR_FATAL;
-                               goto error;
-                       }
+               struct lttng_dynamic_buffer payload;
+               struct lttng_session_descriptor *return_descriptor = NULL;
 
-                       /* Receive variable len data */
-                       DBG("Waiting for %zu URIs from client ...", nb_uri);
-                       ret = lttcomm_recv_unix_sock(sock, uris, len);
-                       if (ret <= 0) {
-                               DBG("No URIs received from client... continuing");
-                               *sock_error = 1;
-                               ret = LTTNG_ERR_SESSION_FAIL;
-                               free(uris);
-                               goto error;
-                       }
-
-                       if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
-                               DBG("Creating session with ONE network URI is a bad call");
-                               ret = LTTNG_ERR_SESSION_FAIL;
-                               free(uris);
-                               goto error;
-                       }
+               lttng_dynamic_buffer_init(&payload);
+               ret = cmd_create_session(cmd_ctx, *sock, &return_descriptor);
+               if (ret != LTTNG_OK) {
+                       goto error;
                }
 
-               ret = cmd_create_session_snapshot(cmd_ctx->lsm->session.name, uris,
-                               nb_uri, &cmd_ctx->creds);
-               free(uris);
-               break;
-       }
-       case LTTNG_CREATE_SESSION_LIVE:
-       {
-               size_t nb_uri, len;
-               struct lttng_uri *uris = NULL;
-
-               nb_uri = cmd_ctx->lsm->u.uri.size;
-               len = nb_uri * sizeof(struct lttng_uri);
-
-               if (nb_uri > 0) {
-                       uris = zmalloc(len);
-                       if (uris == NULL) {
-                               ret = LTTNG_ERR_FATAL;
-                               goto error;
-                       }
-
-                       /* Receive variable len data */
-                       DBG("Waiting for %zu URIs from client ...", nb_uri);
-                       ret = lttcomm_recv_unix_sock(sock, uris, len);
-                       if (ret <= 0) {
-                               DBG("No URIs received from client... continuing");
-                               *sock_error = 1;
-                               ret = LTTNG_ERR_SESSION_FAIL;
-                               free(uris);
-                               goto error;
-                       }
-
-                       if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
-                               DBG("Creating session with ONE network URI is a bad call");
-                               ret = LTTNG_ERR_SESSION_FAIL;
-                               free(uris);
-                               goto error;
-                       }
+               ret = lttng_session_descriptor_serialize(return_descriptor,
+                               &payload);
+               if (ret) {
+                       ERR("Failed to serialize session descriptor in reply to \"create session\" command");
+                       lttng_session_descriptor_destroy(return_descriptor);
+                       ret = LTTNG_ERR_NOMEM;
+                       goto error;
                }
-
-               ret = cmd_create_session_uri(cmd_ctx->lsm->session.name, uris,
-                               nb_uri, &cmd_ctx->creds, cmd_ctx->lsm->u.session_live.timer_interval);
-               free(uris);
+               ret = setup_lttng_msg_no_cmd_header(cmd_ctx, payload.data,
+                               payload.size);
+               if (ret) {
+                       lttng_session_descriptor_destroy(return_descriptor);
+                       ret = LTTNG_ERR_NOMEM;
+                       goto error;
+               }
+               lttng_dynamic_buffer_reset(&payload);
+               lttng_session_descriptor_destroy(return_descriptor);
+               ret = LTTNG_OK;
                break;
        }
        case LTTNG_SAVE_SESSION:
@@ -1895,13 +2005,13 @@ error_add_context:
        }
        case LTTNG_REGISTER_TRIGGER:
        {
-               ret = cmd_register_trigger(cmd_ctx, sock,
+               ret = cmd_register_trigger(cmd_ctx, *sock,
                                notification_thread_handle);
                break;
        }
        case LTTNG_UNREGISTER_TRIGGER:
        {
-               ret = cmd_unregister_trigger(cmd_ctx, sock,
+               ret = cmd_unregister_trigger(cmd_ctx, *sock,
                                notification_thread_handle);
                break;
        }
@@ -1918,7 +2028,9 @@ error_add_context:
                        goto error;
                }
 
-               ret = cmd_rotate_session(cmd_ctx->session, &rotate_return);
+               ret = cmd_rotate_session(cmd_ctx->session, &rotate_return,
+                       false,
+                       LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
                if (ret < 0) {
                        ret = -ret;
                        goto error;
@@ -2002,6 +2114,11 @@ error_add_context:
                ret = LTTNG_OK;
                break;
        }
+       case LTTNG_CLEAR_SESSION:
+       {
+               ret = cmd_clear_session(cmd_ctx->session, sock);
+               break;
+       }
        default:
                ret = LTTNG_ERR_UND;
                break;
@@ -2020,6 +2137,7 @@ setup_error:
        if (cmd_ctx->session) {
                session_unlock(cmd_ctx->session);
                session_put(cmd_ctx->session);
+               cmd_ctx->session = NULL;
        }
        if (need_tracing_session) {
                session_unlock_list();
@@ -2053,8 +2171,11 @@ static int create_client_sock(void)
        /* File permission MUST be 660 */
        ret = chmod(config.client_unix_sock_path.value, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
        if (ret < 0) {
-               ERR("Set file permissions failed: %s", config.client_unix_sock_path.value);
+               ERR("Set file permissions failed: %s",
+                               config.client_unix_sock_path.value);
                PERROR("chmod");
+               (void) lttcomm_close_unix_sock(client_sock);
+               ret = -1;
                goto end;
        }
        DBG("Created client socket (fd = %i)", client_sock);
@@ -2071,6 +2192,11 @@ static void cleanup_client_thread(void *data)
        lttng_pipe_destroy(quit_pipe);
 }
 
+static void thread_init_cleanup(void *data)
+{
+       set_thread_status(false);
+}
+
 /*
  * This thread manage all clients request using the unix client socket for
  * communication.
@@ -2082,7 +2208,7 @@ static void *thread_manage_clients(void *data)
        uint32_t revents, nb_fd;
        struct command_ctx *cmd_ctx = NULL;
        struct lttng_poll_event events;
-       int client_sock = -1;
+       const int client_sock = thread_state.client_sock;
        struct lttng_pipe *quit_pipe = data;
        const int thread_quit_pipe_fd = lttng_pipe_get_readfd(quit_pipe);
 
@@ -2090,10 +2216,7 @@ static void *thread_manage_clients(void *data)
 
        is_root = (getuid() == 0);
 
-       client_sock = create_client_sock();
-       if (client_sock < 0) {
-               goto error_listen;
-       }
+       pthread_cleanup_push(thread_init_cleanup, NULL);
 
        rcu_register_thread();
 
@@ -2127,6 +2250,10 @@ static void *thread_manage_clients(void *data)
                goto error;
        }
 
+       /* Set state as running. */
+        set_thread_status(true);
+       pthread_cleanup_pop(0);
+
        /* This testpoint is after we signal readiness to the parent. */
        if (testpoint(sessiond_thread_manage_clients)) {
                goto error;
@@ -2138,9 +2265,6 @@ static void *thread_manage_clients(void *data)
 
        health_code_update();
 
-       /* Set state as running. */
-        set_thread_state_running();
-
        while (1) {
                const struct cmd_completion_handler *cmd_completion_handler;
 
@@ -2169,11 +2293,6 @@ static void *thread_manage_clients(void *data)
 
                        health_code_update();
 
-                       if (!revents) {
-                               /* No activity for this FD (poll implementation). */
-                               continue;
-                       }
-
                        if (pollfd == thread_quit_pipe_fd) {
                                err = 0;
                                goto exit;
@@ -2262,14 +2381,16 @@ static void *thread_manage_clients(void *data)
                 * informations for the client. The command context struct contains
                 * everything this function may needs.
                 */
-               ret = process_client_msg(cmd_ctx, sock, &sock_error);
+               ret = process_client_msg(cmd_ctx, &sock, &sock_error);
                rcu_thread_offline();
                if (ret < 0) {
-                       ret = close(sock);
-                       if (ret) {
-                               PERROR("close");
-                       }
-                       sock = -1;
+                       if (sock >= 0) {
+                               ret = close(sock);
+                               if (ret) {
+                                       PERROR("close");
+                               }
+                        }
+                        sock = -1;
                        /*
                         * TODO: Inform client somehow of the fatal error. At
                         * this point, ret < 0 means that a zmalloc failed
@@ -2295,21 +2416,24 @@ static void *thread_manage_clients(void *data)
 
                health_code_update();
 
-               DBG("Sending response (size: %d, retcode: %s (%d))",
-                               cmd_ctx->lttng_msg_size,
-                               lttng_strerror(-cmd_ctx->llm->ret_code),
-                               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");
-               }
+               if (sock >= 0) {
+                       DBG("Sending response (size: %d, retcode: %s (%d))",
+                                       cmd_ctx->lttng_msg_size,
+                                       lttng_strerror(-cmd_ctx->llm->ret_code),
+                                       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");
+                       }
 
-               /* End of transmission */
-               ret = close(sock);
-               if (ret) {
-                       PERROR("close");
-               }
-               sock = -1;
+                       /* End of transmission */
+                       ret = close(sock);
+                       if (ret) {
+                               PERROR("close");
+                       }
+                }
+                sock = -1;
 
                clean_command_ctx(&cmd_ctx);
 
@@ -2331,11 +2455,9 @@ error:
 error_listen:
 error_create_poll:
        unlink(config.client_unix_sock_path.value);
-       if (client_sock >= 0) {
-               ret = close(client_sock);
-               if (ret) {
-                       PERROR("close");
-               }
+       ret = close(client_sock);
+       if (ret) {
+               PERROR("close");
        }
 
        if (err) {
@@ -2362,14 +2484,23 @@ bool shutdown_client_thread(void *thread_data)
 
 struct lttng_thread *launch_client_thread(void)
 {
+       bool thread_running;
        struct lttng_pipe *client_quit_pipe;
-       struct lttng_thread *thread;
+       struct lttng_thread *thread = NULL;
+       int client_sock_fd = -1;
 
+       sem_init(&thread_state.ready, 0, 0);
        client_quit_pipe = lttng_pipe_open(FD_CLOEXEC);
        if (!client_quit_pipe) {
                goto error;
        }
 
+       client_sock_fd = create_client_sock();
+       if (client_sock_fd < 0) {
+               goto error;
+       }
+
+       thread_state.client_sock = client_sock_fd;
        thread = lttng_thread_create("Client management",
                        thread_manage_clients,
                        shutdown_client_thread,
@@ -2378,15 +2509,26 @@ struct lttng_thread *launch_client_thread(void)
        if (!thread) {
                goto error;
        }
+       /* The client thread now owns the client sock fd and the quit pipe. */
+       client_sock_fd = -1;
+       client_quit_pipe = NULL;
 
        /*
         * This thread is part of the threads that need to be fully
         * initialized before the session daemon is marked as "ready".
         */
-       wait_thread_state_running();
-
+       thread_running = wait_thread_status();
+       if (!thread_running) {
+               goto error;
+       }
        return thread;
 error:
+       if (client_sock_fd >= 0) {
+               if (close(client_sock_fd)) {
+                       PERROR("Failed to close client socket");
+               }
+       }
+       lttng_thread_put(thread);
        cleanup_client_thread(client_quit_pipe);
        return NULL;
 }
This page took 0.058975 seconds and 4 git commands to generate.