X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=4b2fb52c2dd256e5a68809af7107d1dc78631c29;hp=90aea69fc2e6e4a15266dca3fc35124448179869;hb=64a23ac4e22093a782b87fe615fabf20edacedd2;hpb=6abb15de23fcd1413963aef20f9f2c243f1bf749 diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 90aea69fc..4b2fb52c2 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -40,210 +41,124 @@ #include "liblttsessiondcomm.h" #include "ltt-sessiond.h" #include "lttngerr.h" +#include "kernel-ctl.h" +#include "ust-ctl.h" #include "session.h" -#include "trace.h" #include "traceable-app.h" +/* + * TODO: + * teardown: signal SIGTERM handler -> write into pipe. Threads waits + * with epoll on pipe and on other pipes/sockets for commands. Main + * simply waits on pthread join. + */ + /* Const values */ const char default_home_dir[] = DEFAULT_HOME_DIR; -const char default_tracing_group[] = DEFAULT_TRACING_GROUP; +const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP; const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR; const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE; -/* Static functions */ -static int check_existing_daemon(void); -static int connect_app(pid_t pid); -static int init_daemon_socket(void); -static int notify_apps(const char* name); -static int process_client_msg(int sock, struct lttcomm_session_msg*); -static int send_unix_sock(int sock, void *buf, size_t len); -static int set_signal_handler(void); -static int set_permissions(void); -static int setup_data_buffer(char **buf, size_t size, struct lttcomm_lttng_header *llh); -static int create_lttng_rundir(void); -static int set_kconsumerd_sockets(void); -static void cleanup(void); -static void copy_common_data(struct lttcomm_lttng_header *llh, struct lttcomm_session_msg *lsm); -static void sighandler(int sig); - -static void *thread_manage_clients(void *data); -static void *thread_manage_apps(void *data); -static void *thread_manage_kconsumerd(void *data); - /* Variables */ -int opt_verbose; -int opt_quiet; +int opt_verbose; /* Not static for lttngerr.h */ +int opt_quiet; /* Not static for lttngerr.h */ const char *progname; const char *opt_tracing_group; static int opt_sig_parent; static int opt_daemon; static int is_root; /* Set to 1 if the daemon is running as root */ -static pid_t ppid; +static pid_t ppid; /* Parent PID for --sig-parent option */ +static pid_t kconsumerd_pid; static char apps_unix_sock_path[PATH_MAX]; /* Global application Unix socket path */ static char client_unix_sock_path[PATH_MAX]; /* Global client Unix socket path */ static char kconsumerd_err_unix_sock_path[PATH_MAX]; /* kconsumerd error Unix socket path */ static char kconsumerd_cmd_unix_sock_path[PATH_MAX]; /* kconsumerd command Unix socket path */ +/* Sockets and FDs */ static int client_sock; static int apps_sock; static int kconsumerd_err_sock; +static int kconsumerd_cmd_sock; +static int kernel_tracer_fd; -static struct ltt_session *current_session; +/* Pthread, Mutexes and Semaphores */ +static pthread_t kconsumerd_thread; +static pthread_t apps_thread; +static pthread_t client_thread; +static sem_t kconsumerd_sem; + +static pthread_mutex_t kconsumerd_pid_mutex; /* Mutex to control kconsumerd pid assignation */ /* - * thread_manage_kconsumerd + * teardown_kernel_session * - * This thread manage the kconsumerd error sent - * back to the session daemon. + * Complete teardown of a kernel session. This free all data structure + * related to a kernel session and update counter. */ -static void *thread_manage_kconsumerd(void *data) +static void teardown_kernel_session(struct ltt_session *session) { - int sock, ret; - - DBG("[thread] Manage kconsumerd started"); - - ret = lttcomm_listen_unix_sock(kconsumerd_err_sock); - if (ret < 0) { - goto error; - } - - sock = lttcomm_accept_unix_sock(kconsumerd_err_sock); - if (sock < 0) { - goto error; - } - - while (1) { - //ret = lttcomm_recv_unix_sock(sock, &lsm, sizeof(lsm)); - if (ret <= 0) { - /* TODO: Consumerd died? */ - continue; - } + if (session->kernel_session != NULL) { + DBG("Tearing down kernel session"); + trace_destroy_kernel_session(session->kernel_session); + /* Extra precaution */ + session->kernel_session = NULL; + /* Decrement session count */ + session->kern_session_count--; } - -error: - return NULL; } /* - * thread_manage_apps + * cleanup * - * This thread manage the application socket communication + * Cleanup the daemon on exit */ -static void *thread_manage_apps(void *data) +static void cleanup() { - int sock, ret; - - /* TODO: Something more elegant is needed but fine for now */ - struct { - int reg; /* 1:register, 0:unregister */ - pid_t pid; - uid_t uid; - } reg_msg; - - DBG("[thread] Manage apps started"); - - /* Notify all applications to register */ - notify_apps(default_global_apps_pipe); - - ret = lttcomm_listen_unix_sock(apps_sock); - if (ret < 0) { - goto error; - } + int ret; + char *cmd; + struct ltt_session *sess; - while (1) { - /* Blocking call, waiting for transmission */ - sock = lttcomm_accept_unix_sock(apps_sock); - if (sock < 0) { - goto error; - } + DBG("Cleaning up"); - /* Basic recv here to handle the very simple data - * that the libust send to register (reg_msg). - */ - ret = recv(sock, ®_msg, sizeof(reg_msg), 0); - if (ret < 0) { - perror("recv"); - continue; - } + /* */ + MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm", 27,1,31,27,0); + MSG("%c[%d;%dmMatthew, BEET driven development works!%c[%dm",27,1,33,27,0); + /* */ - /* Add application to the global traceable list */ - if (reg_msg.reg == 1) { - /* Registering */ - ret = register_traceable_app(reg_msg.pid, reg_msg.uid); - if (ret < 0) { - /* register_traceable_app only return an error with - * ENOMEM. At this point, we better stop everything. - */ - goto error; - } - } else { - /* Unregistering */ - unregister_traceable_app(reg_msg.pid); - } + /* Stopping all threads */ + DBG("Terminating all threads"); + pthread_cancel(client_thread); + pthread_cancel(apps_thread); + if (kconsumerd_pid != 0) { + pthread_cancel(kconsumerd_thread); } -error: - - return NULL; -} - -/* - * thread_manage_clients - * - * This thread manage all clients request using the unix - * client socket for communication. - */ -static void *thread_manage_clients(void *data) -{ - int sock, ret; - struct lttcomm_session_msg lsm; - - DBG("[thread] Manage client started"); + DBG("Unlinking all unix socket"); + unlink(client_unix_sock_path); + unlink(apps_unix_sock_path); + unlink(kconsumerd_err_unix_sock_path); - ret = lttcomm_listen_unix_sock(client_sock); + DBG("Removing %s directory", LTTNG_RUNDIR); + ret = asprintf(&cmd, "rm -rf " LTTNG_RUNDIR); if (ret < 0) { - goto error; + ERR("asprintf failed. Something is really wrong!"); } - /* Notify parent pid that we are ready - * to accept command for client side. - */ - if (opt_sig_parent) { - kill(ppid, SIGCHLD); + /* Remove lttng run directory */ + ret = system(cmd); + if (ret < 0) { + ERR("Unable to clean " LTTNG_RUNDIR); } - while (1) { - /* Blocking call, waiting for transmission */ - sock = lttcomm_accept_unix_sock(client_sock); - if (sock < 0) { - goto error; - } - - /* - * Data is received from the lttng client. The struct - * lttcomm_session_msg (lsm) contains the command and data - * request of the client. - */ - ret = lttcomm_recv_unix_sock(sock, &lsm, sizeof(lsm)); - if (ret <= 0) { - continue; - } - - /* This function dispatch the work to the LTTng or UST libs - * and then sends back the response to the client. This is needed - * because there might be more then one lttcomm_lttng_header to - * send out so process_client_msg do both jobs. - */ - ret = process_client_msg(sock, &lsm); - if (ret < 0) { - /* Error detected but still accept command */ - continue; - } + DBG("Cleaning up all session"); + /* Cleanup ALL session */ + cds_list_for_each_entry(sess, <t_session_list.head, list) { + teardown_kernel_session(sess); + // TODO complete session cleanup (including UST) } -error: - return NULL; + close(kernel_tracer_fd); } /* @@ -264,7 +179,27 @@ static int send_unix_sock(int sock, void *buf, size_t len) } /* - * connect_app + * clean_command_ctx + * + * Free memory of a command context structure. + */ +static void clean_command_ctx(struct command_ctx *cmd_ctx) +{ + DBG("Clean command context structure %p", cmd_ctx); + if (cmd_ctx) { + if (cmd_ctx->llm) { + free(cmd_ctx->llm); + } + if (cmd_ctx->lsm) { + free(cmd_ctx->lsm); + } + free(cmd_ctx); + cmd_ctx = NULL; + } +} + +/* + * ust_connect_app * * Return a socket connected to the libust communication socket * of the application identified by the pid. @@ -272,7 +207,7 @@ static int send_unix_sock(int sock, void *buf, size_t len) * If the pid is not found in the traceable list, * return -1 to indicate error. */ -static int connect_app(pid_t pid) +static int ust_connect_app(pid_t pid) { int sock; struct ltt_traceable_app *lta; @@ -327,177 +262,376 @@ error: } /* - * ust_create_trace + * setup_lttng_msg + * + * Setup the outgoing data buffer for the response (llm) by allocating the + * right amount of memory and copying the original information from the lsm + * structure. * - * Create an userspace trace using pid. - * This trace is then appended to the current session - * ust trace list. + * Return total size of the buffer pointed by buf. */ -static int ust_create_trace(pid_t pid) +static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size) { - int sock, ret; - struct ltt_ust_trace *trace; + int ret, buf_size, trace_name_size; - DBG("Creating trace for pid %d", pid); + /* + * Check for the trace_name. If defined, it's part of the payload data of + * the llm structure. + */ + trace_name_size = strlen(cmd_ctx->lsm->trace_name); + buf_size = trace_name_size + size; - trace = malloc(sizeof(struct ltt_ust_trace)); - if (trace == NULL) { + cmd_ctx->llm = malloc(sizeof(struct lttcomm_lttng_msg) + buf_size); + if (cmd_ctx->llm == NULL) { perror("malloc"); - ret = -1; + ret = -ENOMEM; goto error; } - /* Init */ - trace->pid = pid; - trace->shmid = 0; - /* NOTE: to be removed. Trace name will no longer be - * required for LTTng userspace tracer. For now, we set it - * to 'auto' for API compliance. - */ - snprintf(trace->name, 5, "auto"); - - /* Connect to app using ustctl API */ - sock = connect_app(pid); - if (sock < 0) { - ret = LTTCOMM_NO_TRACEABLE; - goto error; + /* Copy common data */ + cmd_ctx->llm->cmd_type = cmd_ctx->lsm->cmd_type; + cmd_ctx->llm->pid = cmd_ctx->lsm->pid; + if (!uuid_is_null(cmd_ctx->lsm->session_uuid)) { + uuid_copy(cmd_ctx->llm->session_uuid, cmd_ctx->lsm->session_uuid); } - ret = ustctl_create_trace(sock, trace->name); - if (ret < 0) { - ret = LTTCOMM_CREATE_FAIL; - goto error; - } + cmd_ctx->llm->trace_name_offset = trace_name_size; + cmd_ctx->llm->data_size = size; + cmd_ctx->lttng_msg_size = sizeof(struct lttcomm_lttng_msg) + buf_size; - /* Check if current session is valid */ - if (current_session) { - cds_list_add(&trace->list, ¤t_session->ust_traces); - current_session->ust_trace_count++; - } + /* Copy trace name to the llm structure. Begining of the payload. */ + memcpy(cmd_ctx->llm->payload, cmd_ctx->lsm->trace_name, trace_name_size); + + return buf_size; error: return ret; } /* - * ust_start_trace + * thread_manage_kconsumerd * - * Start a trace. This trace, identified by the pid, must be - * in the current session ust_traces list. + * This thread manage the kconsumerd error sent + * back to the session daemon. */ -static int ust_start_trace(pid_t pid) +static void *thread_manage_kconsumerd(void *data) { int sock, ret; - struct ltt_ust_trace *trace; + enum lttcomm_return_code code; - DBG("Starting trace for pid %d", pid); + DBG("[thread] Manage kconsumerd started"); - trace = find_session_ust_trace_by_pid(current_session, pid); - if (trace == NULL) { - ret = LTTCOMM_NO_TRACE; + ret = lttcomm_listen_unix_sock(kconsumerd_err_sock); + if (ret < 0) { goto error; } - /* Connect to app using ustctl API */ - sock = connect_app(pid); + sock = lttcomm_accept_unix_sock(kconsumerd_err_sock); if (sock < 0) { - ret = LTTCOMM_NO_TRACEABLE; goto error; } - ret = ustctl_start_trace(sock, "auto"); - if (ret < 0) { - ret = LTTCOMM_START_FAIL; + ret = lttcomm_recv_unix_sock(sock, &code, sizeof(enum lttcomm_return_code)); + if (ret <= 0) { + goto error; + } + + if (code == KCONSUMERD_COMMAND_SOCK_READY) { + kconsumerd_cmd_sock = lttcomm_connect_unix_sock(kconsumerd_cmd_unix_sock_path); + if (kconsumerd_cmd_sock < 0) { + perror("kconsumerd connect"); + goto error; + } + /* Signal condition to tell that the kconsumerd is ready */ + sem_post(&kconsumerd_sem); + DBG("Kconsumerd command socket ready"); + } else { + DBG("Kconsumerd error when waiting for SOCK_READY : %s", + lttcomm_get_readable_code(-code)); goto error; } + while (1) { + /* Wait for any kconsumerd error */ + ret = lttcomm_recv_unix_sock(sock, &code, sizeof(enum lttcomm_return_code)); + if (ret <= 0) { + ERR("Kconsumerd closed the command socket"); + goto error; + } + + ERR("Kconsumerd return code : %s", lttcomm_get_readable_code(-code)); + if (code != KCONSUMERD_POLL_HUP) { + goto error; + } + } + error: - return ret; + kconsumerd_pid = 0; + DBG("Kconsumerd thread dying"); + return NULL; } /* - * ust_stop_trace + * thread_manage_apps * - * Stop a trace. This trace, identified by the pid, must be - * in the current session ust_traces list. + * This thread manage the application socket communication */ -static int ust_stop_trace(pid_t pid) +static void *thread_manage_apps(void *data) { int sock, ret; - struct ltt_ust_trace *trace; - DBG("Stopping trace for pid %d", pid); + /* TODO: Something more elegant is needed but fine for now */ + /* FIXME: change all types to either uint8_t, uint32_t, uint64_t + * for 32-bit vs 64-bit compat processes. */ + /* replicate in ust with version number */ + struct { + int reg; /* 1:register, 0:unregister */ + pid_t pid; + uid_t uid; + } reg_msg; + + DBG("[thread] Manage apps started"); - trace = find_session_ust_trace_by_pid(current_session, pid); - if (trace == NULL) { - ret = LTTCOMM_NO_TRACE; + ret = lttcomm_listen_unix_sock(apps_sock); + if (ret < 0) { goto error; } - /* Connect to app using ustctl API */ - sock = connect_app(pid); - if (sock < 0) { - ret = LTTCOMM_NO_TRACEABLE; - goto error; + /* Notify all applications to register */ + notify_apps(default_global_apps_pipe); + + while (1) { + DBG("Accepting application registration"); + /* Blocking call, waiting for transmission */ + sock = lttcomm_accept_unix_sock(apps_sock); + if (sock < 0) { + goto error; + } + + /* Basic recv here to handle the very simple data + * that the libust send to register (reg_msg). + */ + ret = recv(sock, ®_msg, sizeof(reg_msg), 0); + if (ret < 0) { + perror("recv"); + continue; + } + + /* Add application to the global traceable list */ + if (reg_msg.reg == 1) { + /* Registering */ + ret = register_traceable_app(reg_msg.pid, reg_msg.uid); + if (ret < 0) { + /* register_traceable_app only return an error with + * ENOMEM. At this point, we better stop everything. + */ + goto error; + } + } else { + /* Unregistering */ + unregister_traceable_app(reg_msg.pid); + } } - ret = ustctl_stop_trace(sock, trace->name); - if (ret < 0) { - ret = LTTCOMM_STOP_FAIL; +error: + + return NULL; +} + +/* + * spawn_kconsumerd_thread + * + * Start the thread_manage_kconsumerd. This must be done after a kconsumerd + * exec or it will fails. + */ +static int spawn_kconsumerd_thread(void) +{ + int ret; + + /* Setup semaphore */ + sem_init(&kconsumerd_sem, 0, 0); + + ret = pthread_create(&kconsumerd_thread, NULL, thread_manage_kconsumerd, (void *) NULL); + if (ret != 0) { + perror("pthread_create kconsumerd"); goto error; } + /* Wait for the kconsumerd thread to be ready */ + sem_wait(&kconsumerd_sem); + + return 0; + error: return ret; } /* - * copy_common_data + * spawn_kconsumerd + * + * Fork and exec a kernel consumer daemon (kconsumerd). + * + * NOTE: It is very important to fork a kconsumerd BEFORE opening any kernel + * file descriptor using the libkernelctl or kernel-ctl functions. So, a + * kernel consumer MUST only be spawned before creating a kernel session. * - * Copy common data between lttcomm_lttng_header and lttcomm_session_msg + * Return pid if successful else -1. */ -static void copy_common_data(struct lttcomm_lttng_header *llh, struct lttcomm_session_msg *lsm) +static pid_t spawn_kconsumerd(void) { - llh->cmd_type = lsm->cmd_type; - llh->pid = lsm->pid; + int ret; + pid_t pid; - /* Manage uuid */ - if (!uuid_is_null(lsm->session_id)) { - uuid_copy(llh->session_id, lsm->session_id); + pid = fork(); + if (pid == 0) { + /* + * Exec kconsumerd. + */ + execlp("kconsumerd", "kconsumerd", "--daemonize", NULL); + if (errno != 0) { + perror("kernel start consumer exec"); + } + exit(EXIT_FAILURE); + } else if (pid > 0) { + ret = pid; + goto error; + } else { + perror("kernel start consumer fork"); + ret = -errno; + goto error; } - strncpy(llh->trace_name, lsm->trace_name, strlen(llh->trace_name)); - llh->trace_name[strlen(llh->trace_name) - 1] = '\0'; +error: + return ret; } /* - * setup_data_buffer + * start_kconsumerd * - * Setup the outgoing data buffer for the response - * data allocating the right amount of memory. + * Spawn the kconsumerd daemon and session daemon thread. + */ +static int start_kconsumerd(void) +{ + int ret; + + DBG("Spawning kconsumerd"); + + pthread_mutex_lock(&kconsumerd_pid_mutex); + if (kconsumerd_pid == 0) { + ret = spawn_kconsumerd(); + if (ret < 0) { + ERR("Spawning kconsumerd failed"); + ret = LTTCOMM_KERN_CONSUMER_FAIL; + pthread_mutex_unlock(&kconsumerd_pid_mutex); + goto error; + } + + /* Setting up the global kconsumerd_pid */ + kconsumerd_pid = ret; + } + pthread_mutex_unlock(&kconsumerd_pid_mutex); + + DBG("Kconsumerd pid %d", ret); + + DBG("Spawning kconsumerd thread"); + + ret = spawn_kconsumerd_thread(); + if (ret < 0) { + ERR("Fatal error spawning kconsumerd thread"); + ret = LTTCOMM_FATAL; + goto error; + } + + return 0; + +error: + return ret; +} + +/* + * send_kconsumerd_fds * - * Return total size of the buffer pointed by buf. + * Send all stream fds of the kernel session to the consumer. */ -static int setup_data_buffer(char **buf, size_t s_data, struct lttcomm_lttng_header *llh) +static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) { - int ret = 0; - size_t buf_size; + int ret, i = 0; + /* Plus one here for the metadata fd */ + size_t nb_fd = session->stream_count_global + 1; + int fds[nb_fd]; + struct ltt_kernel_stream *stream; + struct ltt_kernel_channel *chan; + struct lttcomm_kconsumerd_header lkh; + struct lttcomm_kconsumerd_msg buf[nb_fd]; + + /* Add metadata data */ + fds[i] = session->metadata_stream_fd; + buf[i].fd = fds[i]; + buf[i].state = ACTIVE_FD; + buf[i].max_sb_size = session->metadata->conf->subbuf_size; + strncpy(buf[i].path_name, session->metadata->pathname, PATH_MAX); + + cds_list_for_each_entry(chan, &session->channel_list.head, list) { + cds_list_for_each_entry(stream, &chan->stream_list.head, list) { + i++; + fds[i] = stream->fd; + buf[i].fd = stream->fd; + buf[i].state = stream->state; + buf[i].max_sb_size = chan->channel->subbuf_size; + strncpy(buf[i].path_name, stream->pathname, PATH_MAX); + } + } - buf_size = sizeof(struct lttcomm_lttng_header) + s_data; - *buf = malloc(buf_size); - if (*buf == NULL) { - perror("malloc"); - ret = -1; + /* Setup header */ + lkh.payload_size = nb_fd * sizeof(struct lttcomm_kconsumerd_msg); + lkh.cmd_type = LTTCOMM_ADD_STREAM; + + DBG("Sending kconsumerd header"); + + ret = lttcomm_send_unix_sock(sock, &lkh, sizeof(struct lttcomm_kconsumerd_header)); + if (ret < 0) { + perror("send kconsumerd header"); goto error; } - /* Setup lttcomm_lttng_header data and copy - * it to the newly allocated buffer. - */ - llh->payload_size = s_data; - memcpy(*buf, llh, sizeof(struct lttcomm_lttng_header)); + DBG("Sending all fds to kconsumerd"); - return buf_size; + ret = lttcomm_send_fds_unix_sock(sock, buf, fds, nb_fd, lkh.payload_size); + if (ret < 0) { + perror("send kconsumerd fds"); + goto error; + } + + DBG("Kconsumerd fds sent"); + + return 0; + +error: + return ret; +} + +/* + * create_trace_dir + * + * Create the trace output directory. + */ +static int create_trace_dir(struct ltt_kernel_session *session) +{ + int ret; + struct ltt_kernel_channel *chan; + + /* Create all channel directories */ + cds_list_for_each_entry(chan, &session->channel_list.head, list) { + DBG("Creating trace directory at %s", chan->pathname); + ret = mkdir(chan->pathname, S_IRWXU | S_IRWXG ); + if (ret < 0) { + perror("mkdir trace path"); + ret = -errno; + goto error; + } + } + + return 0; error: return ret; @@ -506,195 +640,496 @@ error: /* * process_client_msg * - * This takes the lttcomm_session_msg struct and process the command requested - * by the client. It then creates response(s) and send it back to the - * given socket (sock). + * Process the command requested by the lttng client within the command + * context structure. This function make sure that the return structure (llm) + * is set and ready for transmission before returning. * * Return any error encountered or 0 for success. */ -static int process_client_msg(int sock, struct lttcomm_session_msg *lsm) +static int process_client_msg(struct command_ctx *cmd_ctx) { int ret; - int buf_size; - size_t header_size; - char *send_buf = NULL; - struct lttcomm_lttng_header llh; - DBG("Processing client message"); + DBG("Processing client command %d", cmd_ctx->lsm->cmd_type); + + /* Check command that needs a session */ + switch (cmd_ctx->lsm->cmd_type) { + case LTTNG_CREATE_SESSION: + case LTTNG_LIST_SESSIONS: + case UST_LIST_APPS: + break; + default: + cmd_ctx->session = find_session_by_uuid(cmd_ctx->lsm->session_uuid); + if (cmd_ctx->session == NULL) { + ret = LTTCOMM_SELECT_SESS; + goto error; + } + break; + } + + /* Check command for kernel tracing */ + switch (cmd_ctx->lsm->cmd_type) { + case KERNEL_CREATE_SESSION: + case KERNEL_CREATE_CHANNEL: + case KERNEL_CREATE_STREAM: + case KERNEL_DISABLE_EVENT: + case KERNEL_ENABLE_EVENT: + case KERNEL_OPEN_METADATA: + case KERNEL_START_TRACE: + case KERNEL_STOP_TRACE: + /* TODO: reconnect to kernel tracer to check if + * it's loadded */ + if (kernel_tracer_fd == 0) { + ret = LTTCOMM_KERN_NA; + goto error; + } + break; + } + + /* Connect to ust apps if available pid */ + if (cmd_ctx->lsm->pid > 0) { + /* Connect to app using ustctl API */ + cmd_ctx->ust_sock = ust_connect_app(cmd_ctx->lsm->pid); + if (cmd_ctx->ust_sock < 0) { + ret = LTTCOMM_NO_TRACEABLE; + goto error; + } + } + + /* Process by command type */ + switch (cmd_ctx->lsm->cmd_type) { + case KERNEL_CREATE_SESSION: + { + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + ret = start_kconsumerd(); + if (ret < 0) { + goto error; + } + + DBG("Creating kernel session"); + + ret = kernel_create_session(cmd_ctx->session, kernel_tracer_fd); + if (ret < 0) { + ret = LTTCOMM_KERN_SESS_FAIL; + goto error; + } + + ret = LTTCOMM_OK; + break; + } + case KERNEL_CREATE_CHANNEL: + { + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + DBG("Creating kernel channel"); + + ret = kernel_create_channel(cmd_ctx->session->kernel_session); + + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + + ret = LTTCOMM_OK; + break; + } + case KERNEL_ENABLE_EVENT: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + DBG("Enabling kernel event %s", cmd_ctx->lsm->u.event.event_name); + + ret = kernel_enable_event(cmd_ctx->session->kernel_session, cmd_ctx->lsm->u.event.event_name); + if (ret < 0) { + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; + } + + ret = LTTCOMM_OK; + break; + } + case KERNEL_OPEN_METADATA: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + DBG("Open kernel metadata"); + + ret = kernel_open_metadata(cmd_ctx->session->kernel_session); + if (ret < 0) { + ret = LTTCOMM_KERN_META_FAIL; + goto error; + } + + ret = LTTCOMM_OK; + break; + } + case KERNEL_CREATE_STREAM: + { + struct ltt_kernel_channel *chan; + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + DBG("Creating kernel stream"); + + ret = kernel_create_metadata_stream(cmd_ctx->session->kernel_session); + if (ret < 0) { + ERR("Kernel create metadata stream failed"); + ret = LTTCOMM_KERN_STREAM_FAIL; + goto error; + } + + /* For each channel */ + cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) { + ret = kernel_create_channel_stream(chan); + if (ret < 0) { + ERR("Kernel create channel stream failed"); + ret = LTTCOMM_KERN_STREAM_FAIL; + goto error; + } + /* Update the stream global counter */ + cmd_ctx->session->kernel_session->stream_count_global += ret; + } + + ret = LTTCOMM_OK; + break; + } + case KERNEL_START_TRACE: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + DBG("Start kernel tracing"); + + ret = create_trace_dir(cmd_ctx->session->kernel_session); + if (ret < 0) { + if (ret == -EEXIST) { + ret = LTTCOMM_KERN_DIR_EXIST; + } else { + ret = LTTCOMM_KERN_DIR_FAIL; + goto error; + } + } + + ret = kernel_start_session(cmd_ctx->session->kernel_session); + if (ret < 0) { + ERR("Kernel start session failed"); + ret = LTTCOMM_KERN_START_FAIL; + goto error; + } - /* Copy common data to identify the response - * on the lttng client side. - */ - copy_common_data(&llh, lsm); + ret = send_kconsumerd_fds(kconsumerd_cmd_sock, cmd_ctx->session->kernel_session); + if (ret < 0) { + ERR("Send kconsumerd fds failed"); + ret = LTTCOMM_KERN_CONSUMER_FAIL; + goto error; + } - /* Check command that needs a session */ - if (lsm->cmd_type != LTTNG_CREATE_SESSION && - lsm->cmd_type != LTTNG_LIST_SESSIONS && - lsm->cmd_type != UST_LIST_APPS) + ret = LTTCOMM_OK; + break; + } + case KERNEL_STOP_TRACE: { - current_session = find_session_by_uuid(lsm->session_id); - if (current_session == NULL) { - ret = LTTCOMM_SELECT_SESS; - goto end; + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; } - } - /* Default return code. - * In our world, everything is OK... right? ;) - */ - llh.ret_code = LTTCOMM_OK; + if (cmd_ctx->session->kernel_session == NULL) { + ret = LTTCOMM_KERN_NO_SESSION; + goto error; + } - header_size = sizeof(struct lttcomm_lttng_header); + DBG("Stop kernel tracing"); - /* Process by command type */ - switch (lsm->cmd_type) { - case LTTNG_CREATE_SESSION: - { - ret = create_session(lsm->session_name, &llh.session_id); - if (ret < 0) { - if (ret == -1) { - ret = LTTCOMM_EXIST_SESS; - } else { - ret = LTTCOMM_FATAL; - } - goto end; - } + ret = kernel_stop_session(cmd_ctx->session->kernel_session); + if (ret < 0) { + ERR("Kernel stop session failed"); + ret = LTTCOMM_KERN_STOP_FAIL; + goto error; + } - buf_size = setup_data_buffer(&send_buf, 0, &llh); - if (buf_size < 0) { - ret = LTTCOMM_FATAL; - goto end; - } + /* Clean kernel session teardown */ + teardown_kernel_session(cmd_ctx->session); - break; + ret = LTTCOMM_OK; + break; + } + case LTTNG_CREATE_SESSION: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; } - case LTTNG_DESTROY_SESSION: - { - ret = destroy_session(&lsm->session_id); - if (ret < 0) { - ret = LTTCOMM_NO_SESS; + + ret = create_session(cmd_ctx->lsm->session_name, &cmd_ctx->llm->session_uuid); + if (ret < 0) { + if (ret == -1) { + ret = LTTCOMM_EXIST_SESS; } else { - ret = LTTCOMM_OK; + ret = LTTCOMM_FATAL; } + goto error; + } - /* No auxiliary data so only send the llh struct. */ - goto end; + ret = LTTCOMM_OK; + break; + } + case LTTNG_DESTROY_SESSION: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; } - case LTTNG_LIST_TRACES: - { - unsigned int trace_count = get_trace_count_per_session(current_session); - if (trace_count == 0) { - ret = LTTCOMM_NO_TRACE; - goto end; - } + ret = destroy_session(&cmd_ctx->lsm->session_uuid); + if (ret < 0) { + ret = LTTCOMM_NO_SESS; + goto error; + } - buf_size = setup_data_buffer(&send_buf, - sizeof(struct lttng_trace) * trace_count, &llh); - if (buf_size < 0) { - ret = LTTCOMM_FATAL; - goto end; - } + ret = LTTCOMM_OK; + break; + } + case LTTNG_LIST_TRACES: + { + unsigned int trace_count; - get_traces_per_session(current_session, (struct lttng_trace *)(send_buf + header_size)); - break; + trace_count = get_trace_count_per_session(cmd_ctx->session); + if (trace_count == 0) { + ret = LTTCOMM_NO_TRACE; + goto error; } - case UST_CREATE_TRACE: - { - ret = ust_create_trace(lsm->pid); - if (ret < 0) { - /* If -1 is returned from ust_create_trace, malloc - * failed so it's pretty much a fatal error. - */ - ret = LTTCOMM_FATAL; - goto end; - } - /* No auxiliary data so only send the llh struct. */ - goto end; + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_trace) * trace_count); + if (ret < 0) { + goto setup_error; } - case UST_LIST_APPS: - { - unsigned int app_count = get_app_count(); - /* Stop right now if no apps */ - if (app_count == 0) { - ret = LTTCOMM_NO_APPS; - goto end; - } - /* Setup data buffer and details for transmission */ - buf_size = setup_data_buffer(&send_buf, - sizeof(pid_t) * app_count, &llh); - if (buf_size < 0) { - ret = LTTCOMM_FATAL; - goto end; - } + get_traces_per_session(cmd_ctx->session, + (struct lttng_trace *)(cmd_ctx->llm->payload)); - get_app_list_pids((pid_t *)(send_buf + header_size)); + ret = LTTCOMM_OK; + break; + } + case UST_CREATE_TRACE: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } - break; + ret = ust_create_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; } - case UST_START_TRACE: - { - ret = ust_start_trace(lsm->pid); + break; + } + case UST_LIST_APPS: + { + unsigned int app_count; - /* No auxiliary data so only send the llh struct. */ - goto end; + app_count = get_app_count(); + DBG("Traceable application count : %d", app_count); + if (app_count == 0) { + ret = LTTCOMM_NO_APPS; + goto error; } - case UST_STOP_TRACE: - { - ret = ust_stop_trace(lsm->pid); - /* No auxiliary data so only send the llh struct. */ - goto end; + ret = setup_lttng_msg(cmd_ctx, sizeof(pid_t) * app_count); + if (ret < 0) { + goto setup_error; } - case LTTNG_LIST_SESSIONS: - { - unsigned int session_count = get_session_count(); - /* Stop right now if no session */ - if (session_count == 0) { - ret = LTTCOMM_NO_SESS; - goto end; - } - /* Setup data buffer and details for transmission */ - buf_size = setup_data_buffer(&send_buf, - (sizeof(struct lttng_session) * session_count), &llh); - if (buf_size < 0) { - ret = LTTCOMM_FATAL; - goto end; - } + get_app_list_pids((pid_t *)(cmd_ctx->llm->payload)); - get_lttng_session((struct lttng_session *)(send_buf + header_size)); + ret = LTTCOMM_OK; + break; + } + case UST_START_TRACE: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } - break; + ret = ust_start_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; } - default: - { - /* Undefined command */ - ret = LTTCOMM_UND; - goto end; + break; + } + case UST_STOP_TRACE: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + ret = ust_stop_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; } + break; } + case LTTNG_LIST_SESSIONS: + { + unsigned int session_count; + + session_count = get_session_count(); + if (session_count == 0) { + ret = LTTCOMM_NO_SESS; + goto error; + } + + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * session_count); + if (ret < 0) { + goto setup_error; + } - ret = send_unix_sock(sock, send_buf, buf_size); + get_lttng_session((struct lttng_session *)(cmd_ctx->llm->payload)); - if (send_buf != NULL) { - free(send_buf); + ret = LTTCOMM_OK; + break; + } + default: + /* Undefined command */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + ret = LTTCOMM_UND; + break; } + /* Set return code */ + cmd_ctx->llm->ret_code = ret; + return ret; -end: - DBG("Return code to client %d", ret); +error: + if (cmd_ctx->llm == NULL) { + DBG("Missing llm structure. Allocating one."); + if (setup_lttng_msg(cmd_ctx, 0) < 0) { + goto setup_error; + } + } /* Notify client of error */ - llh.ret_code = ret; - llh.payload_size = 0; - send_unix_sock(sock, (void*) &llh, sizeof(llh)); + cmd_ctx->llm->ret_code = ret; +setup_error: return ret; } +/* + * thread_manage_clients + * + * This thread manage all clients request using the unix + * client socket for communication. + */ +static void *thread_manage_clients(void *data) +{ + int sock, ret; + struct command_ctx *cmd_ctx; + + DBG("[thread] Manage client started"); + + ret = lttcomm_listen_unix_sock(client_sock); + if (ret < 0) { + goto error; + } + + /* Notify parent pid that we are ready + * to accept command for client side. + */ + if (opt_sig_parent) { + kill(ppid, SIGCHLD); + } + + while (1) { + /* Blocking call, waiting for transmission */ + DBG("Accepting client command ..."); + sock = lttcomm_accept_unix_sock(client_sock); + if (sock < 0) { + goto error; + } + + /* Allocate context command to process the client request */ + cmd_ctx = malloc(sizeof(struct command_ctx)); + + /* Allocate data buffer for reception */ + cmd_ctx->lsm = malloc(sizeof(struct lttcomm_session_msg)); + cmd_ctx->llm = NULL; + cmd_ctx->session = NULL; + + /* + * Data is received from the lttng client. The struct + * lttcomm_session_msg (lsm) contains the command and data request of + * the client. + */ + DBG("Receiving data from client ..."); + ret = lttcomm_recv_unix_sock(sock, cmd_ctx->lsm, sizeof(struct lttcomm_session_msg)); + if (ret <= 0) { + continue; + } + + /* + * This function dispatch the work to the kernel or userspace tracer + * libs and fill the lttcomm_lttng_msg data structure of all the needed + * informations for the client. The command context struct contains + * everything this function may needs. + */ + ret = process_client_msg(cmd_ctx); + if (ret < 0) { + /* TODO: Inform client somehow of the fatal error. At this point, + * ret < 0 means that a malloc failed (ENOMEM). */ + /* Error detected but still accept command */ + clean_command_ctx(cmd_ctx); + continue; + } + + DBG("Sending response (size: %d, retcode: %d)", + cmd_ctx->lttng_msg_size, 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"); + } + + clean_command_ctx(cmd_ctx); + } + +error: + return NULL; +} + + /* * usage function on stderr */ @@ -884,7 +1319,10 @@ static const char *get_home_dir(void) /* * set_permissions * - * Set the tracing group gid onto the client socket. + * Set the tracing group gid onto the client socket. + * + * Race window between mkdir and chown is OK because we are going from + * less permissive (root.root) to more permissive (root.tracing). */ static int set_permissions(void) { @@ -949,6 +1387,23 @@ error: return ret; } +/* + * init_kernel_tracer + * + * Setup necessary data for kernel tracer action. + */ +static void init_kernel_tracer(void) +{ + /* Set the global kernel tracer fd */ + kernel_tracer_fd = open(DEFAULT_KERNEL_TRACER_PATH, O_RDWR); + if (kernel_tracer_fd < 0) { + WARN("No kernel tracer available"); + kernel_tracer_fd = 0; + } + + DBG("Kernel tracer fd %d", kernel_tracer_fd); +} + /* * set_kconsumerd_sockets * @@ -993,6 +1448,32 @@ error: return ret; } +/* + * sighandler + * + * Signal handler for the daemon + */ +static void sighandler(int sig) +{ + switch (sig) { + case SIGPIPE: + DBG("SIGPIPE catched"); + return; + case SIGINT: + DBG("SIGINT catched"); + cleanup(); + break; + case SIGTERM: + DBG("SIGTERM catched"); + cleanup(); + break; + default: + break; + } + + exit(EXIT_SUCCESS); +} + /* * set_signal_handler * @@ -1033,74 +1514,13 @@ static int set_signal_handler(void) return ret; } -/** - * sighandler - * - * Signal handler for the daemon - */ -static void sighandler(int sig) -{ - switch (sig) { - case SIGPIPE: - DBG("SIGPIPE catched"); - return; - case SIGINT: - DBG("SIGINT catched"); - cleanup(); - break; - case SIGTERM: - DBG("SIGTERM catched"); - cleanup(); - break; - default: - break; - } - - exit(EXIT_SUCCESS); -} - -/* - * cleanup - * - * Cleanup the daemon on exit - */ -static void cleanup() -{ - int ret; - char *cmd; - - DBG("Cleaning up"); - - /* */ - MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm", 27,1,31,27,0); - MSG("%c[%d;%dmMatthew, BEET driven development works!%c[%dm",27,1,33,27,0); - /* */ - - unlink(client_unix_sock_path); - unlink(apps_unix_sock_path); - unlink(kconsumerd_err_unix_sock_path); - - ret = asprintf(&cmd, "rm -rf " LTTNG_RUNDIR); - if (ret < 0) { - ERR("asprintf failed. Something is really wrong!"); - } - - /* Remove lttng run directory */ - ret = system(cmd); - if (ret < 0) { - ERR("Unable to clean " LTTNG_RUNDIR); - } -} - /* * main */ int main(int argc, char **argv) { - int i; int ret = 0; void *status; - pthread_t threads[2]; /* Parse arguments */ progname = argv[0]; @@ -1141,6 +1561,9 @@ int main(int argc, char **argv) if (ret < 0) { goto error; } + + /* Setup kernel tracer */ + init_kernel_tracer(); } else { if (strlen(apps_unix_sock_path) == 0) { snprintf(apps_unix_sock_path, PATH_MAX, @@ -1154,6 +1577,9 @@ int main(int argc, char **argv) } } + DBG("Client socket path %s", client_unix_sock_path); + DBG("Application socket path %s", apps_unix_sock_path); + /* See if daemon already exist. If any of the two * socket needed by the daemon are present, this test fails */ @@ -1162,7 +1588,7 @@ int main(int argc, char **argv) /* We do not goto error because we must not * cleanup() because a daemon is already running. */ - return EXIT_FAILURE; + exit(EXIT_FAILURE); } if (set_signal_handler() < 0) { @@ -1186,33 +1612,30 @@ int main(int argc, char **argv) while (1) { /* Create thread to manage the client socket */ - ret = pthread_create(&threads[0], NULL, thread_manage_clients, (void *) NULL); + ret = pthread_create(&client_thread, NULL, thread_manage_clients, (void *) NULL); if (ret != 0) { perror("pthread_create"); goto error; } /* Create thread to manage application socket */ - ret = pthread_create(&threads[1], NULL, thread_manage_apps, (void *) NULL); + ret = pthread_create(&apps_thread, NULL, thread_manage_apps, (void *) NULL); if (ret != 0) { perror("pthread_create"); goto error; } - for (i = 0; i < 2; i++) { - ret = pthread_join(threads[i], &status); - if (ret != 0) { - perror("pthread_join"); - goto error; - } + ret = pthread_join(client_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; } } cleanup(); - return 0; + exit(EXIT_SUCCESS); error: cleanup(); - - return EXIT_FAILURE; + exit(EXIT_FAILURE); }