X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=cbd6a3f3f6a7469ddc2be72fb5b313555bf37989;hp=21b05fc8621847523169bae1d59d77e3bdf21391;hb=333f285e479a22c99122aa92b988b10c597551e4;hpb=5e16da05d15eb413f28dea441e1bc49809cddc9b diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 21b05fc86..cbd6a3f3f 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -40,9 +41,11 @@ #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" +#include "lttng-kconsumerd.h" /* * TODO: @@ -53,51 +56,258 @@ /* 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 ust_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; + +/* 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 */ + +/* + * teardown_kernel_session + * + * Complete teardown of a kernel session. This free all data structure + * related to a kernel session and update counter. + */ +static void teardown_kernel_session(struct ltt_session *session) +{ + 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--; + } +} + +/* + * cleanup + * + * Cleanup the daemon on exit + */ +static void cleanup() +{ + int ret; + char *cmd; + struct ltt_session *sess; + + 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); + /* */ + + /* Stopping all threads */ + DBG("Terminating all threads"); + pthread_cancel(client_thread); + pthread_cancel(apps_thread); + if (kconsumerd_pid != 0) { + pthread_cancel(kconsumerd_thread); + } + + DBG("Unlinking all unix socket"); + unlink(client_unix_sock_path); + unlink(apps_unix_sock_path); + unlink(kconsumerd_err_unix_sock_path); + + DBG("Removing %s directory", LTTNG_RUNDIR); + 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); + } + + 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) + } + + close(kernel_tracer_fd); +} + +/* + * send_unix_sock + * + * Send data on a unix socket using the liblttsessiondcomm API. + * + * Return lttcomm error code. + */ +static int send_unix_sock(int sock, void *buf, size_t len) +{ + /* Check valid length */ + if (len <= 0) { + return -1; + } -/* Extern in session.h */ -struct ltt_session *current_session; + return lttcomm_send_unix_sock(sock, buf, len); +} + +/* + * 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. + * + * If the pid is not found in the traceable list, + * return -1 to indicate error. + */ +static int ust_connect_app(pid_t pid) +{ + int sock; + struct ltt_traceable_app *lta; + + DBG("Connect to application pid %d", pid); + + lta = find_app_by_pid(pid); + if (lta == NULL) { + /* App not found */ + DBG("Application pid %d not found", pid); + return -1; + } + + sock = ustctl_connect_pid(lta->pid); + if (sock < 0) { + ERR("Fail connecting to the PID %d\n", pid); + } + + return sock; +} + +/* + * notify_apps + * + * Notify apps by writing 42 to a named pipe using name. + * Every applications waiting for a ltt-sessiond will be notified + * and re-register automatically to the session daemon. + * + * Return open or write error value. + */ +static int notify_apps(const char *name) +{ + int fd; + int ret = -1; + + DBG("Notify the global application pipe"); + + /* Try opening the global pipe */ + fd = open(name, O_WRONLY); + if (fd < 0) { + goto error; + } + + /* Notify by writing on the pipe */ + ret = write(fd, "42", 2); + if (ret < 0) { + perror("write"); + } + +error: + return ret; +} + +/* + * 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. + * + * Return total size of the buffer pointed by buf. + */ +static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size) +{ + int ret, buf_size, trace_name_size; + + /* + * 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; + + cmd_ctx->llm = malloc(sizeof(struct lttcomm_lttng_msg) + buf_size); + if (cmd_ctx->llm == NULL) { + perror("malloc"); + ret = -ENOMEM; + 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); + } + + 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; + + /* 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; +} /* * thread_manage_kconsumerd @@ -108,6 +318,7 @@ struct ltt_session *current_session; static void *thread_manage_kconsumerd(void *data) { int sock, ret; + enum lttcomm_return_code code; DBG("[thread] Manage kconsumerd started"); @@ -121,15 +332,40 @@ static void *thread_manage_kconsumerd(void *data) goto error; } - while (1) { - //ret = lttcomm_recv_unix_sock(sock, &lsm, sizeof(lsm)); - if (ret <= 0) { - /* TODO: Consumerd died? */ - continue; + /* Getting status code from kconsumerd */ + 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) { + sem_post(&kconsumerd_sem); + 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; } + /* 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)); + error: + kconsumerd_pid = 0; + DBG("Kconsumerd thread dying"); return NULL; } @@ -163,6 +399,7 @@ static void *thread_manage_apps(void *data) 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) { @@ -200,397 +437,799 @@ error: } /* - * thread_manage_clients + * spawn_kconsumerd_thread * - * This thread manage all clients request using the unix - * client socket for communication. + * Start the thread_manage_kconsumerd. This must be done after a kconsumerd + * exec or it will fails. */ -static void *thread_manage_clients(void *data) +static int spawn_kconsumerd_thread(void) { - int sock, ret; - struct lttcomm_session_msg lsm; + int ret; - DBG("[thread] Manage client started"); + /* Setup semaphore */ + sem_init(&kconsumerd_sem, 0, 0); - ret = lttcomm_listen_unix_sock(client_sock); - if (ret < 0) { + ret = pthread_create(&kconsumerd_thread, NULL, thread_manage_kconsumerd, (void *) NULL); + if (ret != 0) { + perror("pthread_create kconsumerd"); 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 */ - 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; - } + /* Wait for the kconsumerd thread to be ready */ + sem_wait(&kconsumerd_sem); - /* 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; - } + if (kconsumerd_pid == 0) { + ERR("Kconsumerd did not start"); + goto error; } + return 0; + error: - return NULL; + ret = LTTCOMM_KERN_CONSUMER_FAIL; + return ret; } /* - * send_unix_sock + * spawn_kconsumerd * - * Send data on a unix socket using the liblttsessiondcomm API. + * Fork and exec a kernel consumer daemon (kconsumerd). * - * Return lttcomm error code. + * 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. + * + * Return pid if successful else -1. */ -static int send_unix_sock(int sock, void *buf, size_t len) +static pid_t spawn_kconsumerd(void) { - /* Check valid length */ - if (len <= 0) { - return -1; + int ret; + pid_t pid; + + DBG("Spawning kconsumerd"); + + pid = fork(); + if (pid == 0) { + /* + * Exec kconsumerd. + */ + execlp("kconsumerd", "kconsumerd", "--verbose", 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; } - return lttcomm_send_unix_sock(sock, buf, len); +error: + return ret; } /* - * ust_connect_app + * start_kconsumerd * - * Return a socket connected to the libust communication socket - * of the application identified by the pid. - * - * If the pid is not found in the traceable list, - * return -1 to indicate error. + * Spawn the kconsumerd daemon and session daemon thread. */ -static int ust_connect_app(pid_t pid) +static int start_kconsumerd(void) { - int sock; - struct ltt_traceable_app *lta; + int ret; - DBG("Connect to application pid %d", pid); + pthread_mutex_lock(&kconsumerd_pid_mutex); + if (kconsumerd_pid != 0) { + goto end; + } - lta = find_app_by_pid(pid); - if (lta == NULL) { - /* App not found */ - DBG("Application pid %d not found", pid); - return -1; + ret = spawn_kconsumerd(); + if (ret < 0) { + ERR("Spawning kconsumerd failed"); + ret = LTTCOMM_KERN_CONSUMER_FAIL; + pthread_mutex_unlock(&kconsumerd_pid_mutex); + goto error; } - sock = ustctl_connect_pid(lta->pid); - if (sock < 0) { - ERR("Fail connecting to the PID %d\n", pid); + /* 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"); + goto error; } - return sock; +end: + pthread_mutex_unlock(&kconsumerd_pid_mutex); + return 0; + +error: + return ret; } /* - * notify_apps + * send_kconsumerd_fds * - * Notify apps by writing 42 to a named pipe using name. - * Every applications waiting for a ltt-sessiond will be notified - * and re-register automatically to the session daemon. - * - * Return open or write error value. + * Send all stream fds of the kernel session to the consumer. */ -static int notify_apps(const char *name) +static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) { - int fd; - int ret = -1; + int ret; + size_t nb_fd; + struct ltt_kernel_stream *stream; + struct ltt_kernel_channel *chan; + struct lttcomm_kconsumerd_header lkh; + struct lttcomm_kconsumerd_msg lkm; - DBG("Notify the global application pipe"); + nb_fd = session->stream_count_global; - /* Try opening the global pipe */ - fd = open(name, O_WRONLY); - if (fd < 0) { + /* Setup header */ + lkh.payload_size = (nb_fd + 1) * sizeof(struct lttcomm_kconsumerd_msg); + lkh.cmd_type = 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; } - /* Notify by writing on the pipe */ - ret = write(fd, "42", 2); + DBG("Sending metadata stream fd"); + + /* Send metadata stream fd first */ + lkm.fd = session->metadata_stream_fd; + lkm.state = ACTIVE_FD; + lkm.max_sb_size = session->metadata->conf->subbuf_size; + strncpy(lkm.path_name, session->metadata->pathname, PATH_MAX); + + ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm)); if (ret < 0) { - perror("write"); + perror("send kconsumerd fd"); + goto error; } + cds_list_for_each_entry(chan, &session->channel_list.head, list) { + cds_list_for_each_entry(stream, &chan->stream_list.head, list) { + lkm.fd = stream->fd; + lkm.state = stream->state; + lkm.max_sb_size = chan->channel->subbuf_size; + strncpy(lkm.path_name, stream->pathname, PATH_MAX); + + DBG("Sending fd %d to kconsumerd", lkm.fd); + + ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm)); + if (ret < 0) { + perror("send kconsumerd fd"); + goto error; + } + } + } + + DBG("Kconsumerd fds sent"); + + return 0; + error: return ret; } /* - * copy_common_data + * create_trace_dir * - * Copy common data between lttcomm_lttng_header and lttcomm_session_msg + * Create the trace output directory. */ -static void copy_common_data(struct lttcomm_lttng_header *llh, struct lttcomm_session_msg *lsm) +static int create_trace_dir(struct ltt_kernel_session *session) { - llh->cmd_type = lsm->cmd_type; - llh->pid = lsm->pid; + 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; +} - /* Manage uuid */ - if (!uuid_is_null(lsm->session_id)) { - uuid_copy(llh->session_id, lsm->session_id); +/* + * 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; } - strncpy(llh->trace_name, lsm->trace_name, strlen(llh->trace_name)); - llh->trace_name[strlen(llh->trace_name) - 1] = '\0'; + DBG("Kernel tracer fd %d", kernel_tracer_fd); } /* - * setup_data_buffer + * process_client_msg * - * Setup the outgoing data buffer for the response - * data allocating the right amount of memory. + * 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 total size of the buffer pointed by buf. + * Return any error encountered or 0 for success. */ -static int setup_data_buffer(char **buf, size_t s_data, struct lttcomm_lttng_header *llh) +static int process_client_msg(struct command_ctx *cmd_ctx) { - int ret = 0; - size_t buf_size; + int ret; - buf_size = sizeof(struct lttcomm_lttng_header) + s_data; - *buf = malloc(buf_size); - if (*buf == NULL) { - perror("malloc"); - ret = -1; - goto error; + 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 KERNEL_LIST_EVENTS: + 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; } - /* 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)); + /* 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_LIST_EVENTS: + case KERNEL_OPEN_METADATA: + case KERNEL_START_TRACE: + case KERNEL_STOP_TRACE: + /* Kernel tracer check */ + if (kernel_tracer_fd == 0) { + init_kernel_tracer(); + 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_ENABLE_ALL_EVENT: + { + int pos, size; + char *event_list, *event, *ptr; + + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + DBG("Enabling all kernel event"); + + size = kernel_list_events(kernel_tracer_fd, &event_list); + if (size < 0) { + ret = LTTCOMM_KERN_LIST_FAIL; + goto error; + } + + ptr = event_list; + while ((size = sscanf(ptr, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) { + /* Enable each single event */ + ret = kernel_enable_event(cmd_ctx->session->kernel_session, event); + if (ret < 0) { + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; + } + /* Move pointer to the next line */ + ptr += pos + 1; + free(event); + } + + free(event_list); + + ret = LTTCOMM_OK; + break; + } + case KERNEL_LIST_EVENTS: + { + char *event_list; + ssize_t size; + + size = kernel_list_events(kernel_tracer_fd, &event_list); + if (size < 0) { + ret = LTTCOMM_KERN_LIST_FAIL; + 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(cmd_ctx, size); + if (ret < 0) { + goto setup_error; + } + + /* Copy event list into message payload */ + memcpy(cmd_ctx->llm->payload, event_list, size); + + free(event_list); + + 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; + } - return buf_size; + /* 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; + } -error: - return 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; + } -/* - * 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). - * - * Return any error encountered or 0 for success. - */ -static int process_client_msg(int sock, struct lttcomm_session_msg *lsm) -{ - int ust_sock, ret, buf_size; - size_t header_size; - char *send_buf = NULL; - struct lttcomm_lttng_header llh; + DBG("Start kernel tracing"); - DBG("Processing client message"); + 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; + } + } - /* Copy common data to identify the response - * on the lttng client side. - */ - copy_common_data(&llh, lsm); + ret = kernel_start_session(cmd_ctx->session->kernel_session); + if (ret < 0) { + ERR("Kernel start session failed"); + ret = LTTCOMM_KERN_START_FAIL; + goto error; + } - /* Check command that needs a session */ - switch (lsm->cmd_type) { - case LTTNG_CREATE_SESSION: - case LTTNG_LIST_SESSIONS: - case UST_LIST_APPS: - break; - default: - current_session = find_session_by_uuid(lsm->session_id); - if (current_session == NULL) { - ret = LTTCOMM_SELECT_SESS; - goto end; + 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; } + + ret = LTTCOMM_OK; break; } + case KERNEL_STOP_TRACE: + { + /* 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"); - /* Connect to ust apps if available pid */ - if (lsm->pid != 0) { - /* Connect to app using ustctl API */ - ust_sock = ust_connect_app(lsm->pid); - if (ust_sock < 0) { - ret = LTTCOMM_NO_TRACEABLE; - 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; } - } - /* Process by command type */ - switch (lsm->cmd_type) { + /* Clean kernel session teardown */ + teardown_kernel_session(cmd_ctx->session); + + ret = LTTCOMM_OK; + break; + } case LTTNG_CREATE_SESSION: { - ret = create_session(lsm->session_name, &llh.session_id); + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + 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_FATAL; } - goto end; - } - - buf_size = setup_data_buffer(&send_buf, 0, &llh); - if (buf_size < 0) { - ret = LTTCOMM_FATAL; - goto end; + goto error; } + ret = LTTCOMM_OK; break; } case LTTNG_DESTROY_SESSION: { - ret = destroy_session(&lsm->session_id); + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + ret = destroy_session(&cmd_ctx->lsm->session_uuid); if (ret < 0) { ret = LTTCOMM_NO_SESS; - } else { - ret = LTTCOMM_OK; + goto error; } - /* No auxiliary data so only send the llh struct. */ - goto end; + ret = LTTCOMM_OK; + break; } case LTTNG_LIST_TRACES: { - unsigned int trace_count = get_trace_count_per_session(current_session); + unsigned int trace_count; + trace_count = get_trace_count_per_session(cmd_ctx->session); if (trace_count == 0) { ret = LTTCOMM_NO_TRACE; - goto end; + 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 = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_trace) * trace_count); + if (ret < 0) { + goto setup_error; } - get_traces_per_session(current_session, (struct lttng_trace *)(send_buf + header_size)); + get_traces_per_session(cmd_ctx->session, + (struct lttng_trace *)(cmd_ctx->llm->payload)); + + ret = LTTCOMM_OK; break; } case UST_CREATE_TRACE: { - ret = ust_create_trace(ust_sock, lsm->pid); + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); 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; + goto setup_error; } - /* No auxiliary data so only send the llh struct. */ - goto end; + ret = ust_create_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; + } + break; } case UST_LIST_APPS: { - unsigned int app_count = get_app_count(); - /* Stop right now if no apps */ + unsigned int app_count; + + app_count = get_app_count(); + DBG("Traceable application count : %d", app_count); if (app_count == 0) { ret = LTTCOMM_NO_APPS; - goto end; + goto error; } - /* 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; + ret = setup_lttng_msg(cmd_ctx, sizeof(pid_t) * app_count); + if (ret < 0) { + goto setup_error; } - get_app_list_pids((pid_t *)(send_buf + header_size)); + get_app_list_pids((pid_t *)(cmd_ctx->llm->payload)); + ret = LTTCOMM_OK; break; } case UST_START_TRACE: { - ret = ust_start_trace(ust_sock, lsm->pid); + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } - /* No auxiliary data so only send the llh struct. */ - goto end; + ret = ust_start_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; + } + break; } case UST_STOP_TRACE: { - ret = ust_stop_trace(ust_sock, lsm->pid); + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } - /* No auxiliary data so only send the llh struct. */ - goto end; + ret = ust_stop_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; + } + break; } case LTTNG_LIST_SESSIONS: { - unsigned int session_count = get_session_count(); - /* Stop right now if no session */ + unsigned int session_count; + + session_count = get_session_count(); if (session_count == 0) { ret = LTTCOMM_NO_SESS; - goto end; + goto error; } - /* 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; + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * session_count); + if (ret < 0) { + goto setup_error; } - get_lttng_session((struct lttng_session *)(send_buf + header_size)); + get_lttng_session((struct lttng_session *)(cmd_ctx->llm->payload)); + ret = LTTCOMM_OK; break; } default: /* Undefined command */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + ret = LTTCOMM_UND; - goto end; + break; } - ret = send_unix_sock(sock, send_buf, buf_size); - - if (send_buf != NULL) { - free(send_buf); - } + /* 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); + + /* End of transmission */ + close(sock); + } + +error: + return NULL; +} + + /* * usage function on stderr */ @@ -840,8 +1479,12 @@ static int create_lttng_rundir(void) ret = mkdir(LTTNG_RUNDIR, S_IRWXU | S_IRWXG ); if (ret < 0) { - ERR("Unable to create " LTTNG_RUNDIR); - goto error; + if (errno != EEXIST) { + ERR("Unable to create " LTTNG_RUNDIR); + goto error; + } else { + ret = 0; + } } error: @@ -892,6 +1535,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 * @@ -932,74 +1601,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]; @@ -1040,6 +1648,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, @@ -1053,6 +1664,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 */ @@ -1085,25 +1699,23 @@ 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; } }