Refactoring: use an opaque lttng_tracker_id type
[lttng-tools.git] / src / bin / lttng-sessiond / client.c
index aea667cd116d2fea0132bffec7782b065fc71536..2c7bd4787c9371305455dfa7765ab9397d07877f 100644 (file)
 #include "testpoint.h"
 #include "utils.h"
 #include "manage-consumer.h"
+#include "clear.h"
 
 static bool is_root;
 
 static struct thread_state {
        sem_t ready;
        bool running;
+       int client_sock;
 } thread_state;
 
 static void set_thread_status(bool running)
@@ -410,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;
@@ -478,7 +480,7 @@ 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_create;
@@ -746,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:
@@ -786,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:
@@ -879,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;
@@ -941,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;
                                }
@@ -1130,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;
@@ -1178,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:
@@ -1311,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);
@@ -1335,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,
@@ -1429,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;
                }
@@ -1703,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));
@@ -1724,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:
@@ -1753,7 +1946,7 @@ 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;
        }
@@ -1835,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;
@@ -1919,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;
@@ -1971,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);
@@ -2005,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);
 
@@ -2014,10 +2217,6 @@ static void *thread_manage_clients(void *data)
        is_root = (getuid() == 0);
 
        pthread_cleanup_push(thread_init_cleanup, NULL);
-       client_sock = create_client_sock();
-       if (client_sock < 0) {
-               goto error_listen;
-       }
 
        rcu_register_thread();
 
@@ -2256,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) {
@@ -2289,7 +2486,8 @@ 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);
@@ -2297,6 +2495,12 @@ struct lttng_thread *launch_client_thread(void)
                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,
@@ -2305,6 +2509,9 @@ 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
@@ -2312,11 +2519,16 @@ struct lttng_thread *launch_client_thread(void)
         */
        thread_running = wait_thread_status();
        if (!thread_running) {
-               lttng_thread_put(thread);
-               thread = NULL;
+               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.045998 seconds and 4 git commands to generate.