X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=6fa89dd1e69ee000797584410aac26bc84aa8212;hp=5e99c7987ce59cb7122e6109d198e35d8399b196;hb=4b2221858653255be812d5a4e55c2ec05ec1819e;hpb=273ea72ccbbffd1d6b9d5478923d30571d503a6c diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 5e99c7987..6fa89dd1e 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -3,8 +3,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * as published by the Free Software Foundation; only version 2 + * of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -49,16 +49,8 @@ #include "session.h" #include "traceable-app.h" #include "lttng-kconsumerd.h" -#include "libustctl.h" #include "utils.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[] = LTTNG_DEFAULT_TRACING_GROUP; @@ -68,6 +60,7 @@ const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE; /* Variables */ 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; @@ -112,7 +105,8 @@ static pthread_mutex_t kconsumerd_pid_mutex; /* Mutex to control kconsumerd pid * mutex lock. The lock MUST be taken if you iterate over the list. The lock * MUST NOT be taken if you call a public function in session.c. * - * The lock is nested inside the structure: session_list_ptr->lock. + * The lock is nested inside the structure: session_list_ptr->lock. Please use + * lock_session_list and unlock_session_list for lock acquisition. */ static struct ltt_session_list *session_list_ptr; @@ -136,10 +130,8 @@ error: } /* - * teardown_kernel_session - * - * Complete teardown of a kernel session. This free all data structure related - * to a kernel session and update counter. + * 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) { @@ -152,13 +144,13 @@ static void teardown_kernel_session(struct ltt_session *session) } /* - * Cleanup the daemon + * Cleanup the daemon */ static void cleanup() { int ret; char *cmd; - struct ltt_session *sess; + struct ltt_session *sess, *stmp; DBG("Cleaning up"); @@ -192,7 +184,7 @@ static void cleanup() pthread_mutex_destroy(&session_list_ptr->lock); /* Cleanup ALL session */ - cds_list_for_each_entry(sess, &session_list_ptr->head, list) { + cds_list_for_each_entry_safe(sess, stmp, &session_list_ptr->head, list) { teardown_kernel_session(sess); // TODO complete session cleanup (including UST) } @@ -205,11 +197,9 @@ static void cleanup() } /* - * send_unix_sock + * Send data on a unix socket using the liblttsessiondcomm API. * - * Send data on a unix socket using the liblttsessiondcomm API. - * - * Return lttcomm error code. + * Return lttcomm error code. */ static int send_unix_sock(int sock, void *buf, size_t len) { @@ -222,29 +212,25 @@ static int send_unix_sock(int sock, void *buf, size_t len) } /* - * clean_command_ctx - * - * Free memory of a command context structure. + * Free memory of a command context structure. */ -static void clean_command_ctx(struct command_ctx *cmd_ctx) +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); + DBG("Clean command context structure"); + if (*cmd_ctx) { + if ((*cmd_ctx)->llm) { + free((*cmd_ctx)->llm); } - if (cmd_ctx->lsm) { - free(cmd_ctx->lsm); + if ((*cmd_ctx)->lsm) { + free((*cmd_ctx)->lsm); } - free(cmd_ctx); - cmd_ctx = NULL; + free(*cmd_ctx); + *cmd_ctx = NULL; } } /* - * send_kconsumerd_channel_fds - * - * Send all stream fds of kernel channel to the consumer. + * Send all stream fds of kernel channel to the consumer. */ static int send_kconsumerd_channel_fds(int sock, struct ltt_kernel_channel *channel) { @@ -296,9 +282,7 @@ error: } /* - * send_kconsumerd_fds - * - * Send all stream fds of the kernel session to the consumer. + * Send all stream fds of the kernel session to the consumer. */ static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) { @@ -350,14 +334,12 @@ error: return ret; } +#ifdef DISABLED /* - * ust_connect_app + * Return a socket connected to the libust communication socket of the + * application identified by the pid. * - * 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. + * If the pid is not found in the traceable list, return -1 to indicate error. */ static int ust_connect_app(pid_t pid) { @@ -380,15 +362,14 @@ static int ust_connect_app(pid_t pid) return sock; } +#endif /* DISABLED */ /* - * 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. + * 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. + * Return open or write error value. */ static int notify_apps(const char *name) { @@ -414,13 +395,11 @@ error: } /* - * 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. * - * 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. + * Return total size of the buffer pointed by buf. */ static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size) { @@ -437,7 +416,7 @@ static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size) /* Copy common data */ cmd_ctx->llm->cmd_type = cmd_ctx->lsm->cmd_type; - cmd_ctx->llm->pid = cmd_ctx->lsm->pid; + cmd_ctx->llm->pid = cmd_ctx->lsm->domain.attr.pid; cmd_ctx->llm->data_size = size; cmd_ctx->lttng_msg_size = sizeof(struct lttcomm_lttng_msg) + buf_size; @@ -449,10 +428,8 @@ error: } /* - * update_kernel_pollfd - * - * Update the kernel pollfd set of all channel fd available over - * all tracing session. Add the wakeup pipe at the end of the set. + * Update the kernel pollfd set of all channel fd available over all tracing + * session. Add the wakeup pipe at the end of the set. */ static int update_kernel_pollfd(void) { @@ -468,7 +445,7 @@ static int update_kernel_pollfd(void) DBG("Updating kernel_pollfd"); /* Get the number of channel of all kernel session */ - pthread_mutex_lock(&session_list_ptr->lock); + lock_session_list(); cds_list_for_each_entry(session, &session_list_ptr->head, list) { lock_session(session); if (session->kernel_session == NULL) { @@ -505,7 +482,7 @@ static int update_kernel_pollfd(void) } unlock_session(session); } - pthread_mutex_unlock(&session_list_ptr->lock); + unlock_session_list(); /* Adding wake up pipe */ kernel_pollfd[nb_fd - 2].fd = kernel_poll_pipe[0]; @@ -517,17 +494,15 @@ static int update_kernel_pollfd(void) return nb_fd; error: - pthread_mutex_unlock(&session_list_ptr->lock); + unlock_session_list(); return -1; } /* - * update_kernel_stream + * Find the channel fd from 'fd' over all tracing session. When found, check + * for new channel stream and send those stream fds to the kernel consumer. * - * Find the channel fd from 'fd' over all tracing session. When found, check - * for new channel stream and send those stream fds to the kernel consumer. - * - * Useful for CPU hotplug feature. + * Useful for CPU hotplug feature. */ static int update_kernel_stream(int fd) { @@ -537,7 +512,7 @@ static int update_kernel_stream(int fd) DBG("Updating kernel streams for channel fd %d", fd); - pthread_mutex_lock(&session_list_ptr->lock); + lock_session_list(); cds_list_for_each_entry(session, &session_list_ptr->head, list) { lock_session(session); if (session->kernel_session == NULL) { @@ -568,20 +543,18 @@ static int update_kernel_stream(int fd) } end: + unlock_session_list(); if (session) { unlock_session(session); } - pthread_mutex_unlock(&session_list_ptr->lock); return ret; } /* - * thread_manage_kernel - * - * This thread manage event coming from the kernel. + * This thread manage event coming from the kernel. * - * Features supported in this thread: - * -) CPU Hotplug + * Features supported in this thread: + * -) CPU Hotplug */ static void *thread_manage_kernel(void *data) { @@ -662,10 +635,7 @@ error: } /* - * thread_manage_kconsumerd - * - * This thread manage the kconsumerd error sent - * back to the session daemon. + * This thread manage the kconsumerd error sent back to the session daemon. */ static void *thread_manage_kconsumerd(void *data) { @@ -758,8 +728,6 @@ error: } /* - * thread_manage_apps - * * This thread manage the application socket communication */ static void *thread_manage_apps(void *data) @@ -857,10 +825,8 @@ error: } /* - * spawn_kconsumerd_thread - * - * Start the thread_manage_kconsumerd. This must be done after a kconsumerd - * exec or it will fails. + * Start the thread_manage_kconsumerd. This must be done after a kconsumerd + * exec or it will fails. */ static int spawn_kconsumerd_thread(void) { @@ -891,20 +857,15 @@ error: } /* - * 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. + * Fork and exec a kernel consumer daemon (kconsumerd). * - * Return pid if successful else -1. + * Return pid if successful else -1. */ static pid_t spawn_kconsumerd(void) { int ret; pid_t pid; + const char *verbosity; DBG("Spawning kconsumerd"); @@ -913,7 +874,12 @@ static pid_t spawn_kconsumerd(void) /* * Exec kconsumerd. */ - execlp("ltt-kconsumerd", "ltt-kconsumerd", "--verbose", NULL); + if (opt_verbose > 1) { + verbosity = "--verbose"; + } else { + verbosity = "--quiet"; + } + execl(INSTALL_BIN_PATH "/ltt-kconsumerd", "ltt-kconsumerd", verbosity, NULL); if (errno != 0) { perror("kernel start consumer exec"); } @@ -932,9 +898,7 @@ error: } /* - * start_kconsumerd - * - * Spawn the kconsumerd daemon and session daemon thread. + * Spawn the kconsumerd daemon and session daemon thread. */ static int start_kconsumerd(void) { @@ -975,7 +939,7 @@ error: } /* - * modprobe_kernel_modules + * modprobe_kernel_modules */ static int modprobe_kernel_modules(void) { @@ -1002,7 +966,7 @@ error: } /* - * mount_debugfs + * mount_debugfs */ static int mount_debugfs(char *path) { @@ -1027,9 +991,7 @@ error: } /* - * init_kernel_tracer - * - * Setup necessary data for kernel tracer action. + * Setup necessary data for kernel tracer action. */ static void init_kernel_tracer(void) { @@ -1110,14 +1072,12 @@ error: } /* - * start_kernel_trace - * - * Start tracing by creating trace directory and sending FDs to the kernel - * consumer. + * Start tracing by creating trace directory and sending FDs to the kernel + * consumer. */ static int start_kernel_trace(struct ltt_kernel_session *session) { - int ret; + int ret = 0; if (session->kconsumer_fds_sent == 0) { ret = send_kconsumerd_fds(kconsumerd_cmd_sock, session); @@ -1151,11 +1111,9 @@ static int notify_kernel_pollfd(void) } /* - * init_default_channel - * - * Allocate a channel structure and fill it. + * Allocate a channel structure and fill it. */ -static struct lttng_channel *init_default_channel(void) +static struct lttng_channel *init_default_channel(char *name) { struct lttng_channel *chan; @@ -1165,8 +1123,8 @@ static struct lttng_channel *init_default_channel(void) goto error; } - if (snprintf(chan->name, NAME_MAX, DEFAULT_CHANNEL_NAME) < 0) { - perror("snprintf defautl channel name"); + if (snprintf(chan->name, NAME_MAX, "%s", name) < 0) { + perror("snprintf channel name"); return NULL; } @@ -1182,14 +1140,11 @@ error: } /* - * create_kernel_session - * - * Create a kernel tracer session then create the default channel. + * Create a kernel tracer session then create the default channel. */ static int create_kernel_session(struct ltt_session *session) { int ret; - struct lttng_channel *chan; DBG("Creating kernel session"); @@ -1199,12 +1154,6 @@ static int create_kernel_session(struct ltt_session *session) goto error; } - chan = init_default_channel(); - if (chan == NULL) { - ret = LTTCOMM_FATAL; - goto error; - } - ret = mkdir_recursive(session->path, S_IRWXU | S_IRWXG ); if (ret < 0) { if (ret != EEXIST) { @@ -1213,32 +1162,106 @@ static int create_kernel_session(struct ltt_session *session) } } - DBG("Creating default kernel channel %s", DEFAULT_CHANNEL_NAME); +error: + return ret; +} - ret = kernel_create_channel(session->kernel_session, chan, session->path); - if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; - goto error; +/* + * Using the session list, filled a lttng_session array to send back to the + * client for session listing. + * + * The session list lock MUST be acquired before calling this function. Use + * lock_session_list() and unlock_session_list(). + */ +static void list_lttng_sessions(struct lttng_session *sessions) +{ + int i = 0; + struct ltt_session *session; + + DBG("Getting all available session"); + /* + * Iterate over session list and append data after the control struct in + * the buffer. + */ + cds_list_for_each_entry(session, &session_list_ptr->head, list) { + strncpy(sessions[i].path, session->path, PATH_MAX); + strncpy(sessions[i].name, session->name, NAME_MAX); + i++; } +} - ret = notify_kernel_pollfd(); +/* + * Fill lttng_channel array of all channels. + */ +static void list_lttng_channels(struct ltt_session *session, + struct lttng_channel *channels) +{ + int i = 0; + struct ltt_kernel_channel *kchan; -error: - return ret; + DBG("Listing channels for session %s", session->name); + + /* Kernel channels */ + if (session->kernel_session != NULL) { + cds_list_for_each_entry(kchan, &session->kernel_session->channel_list.head, list) { + /* Copy lttng_channel struct to array */ + memcpy(&channels[i], kchan->channel, sizeof(struct lttng_channel)); + channels[i].enabled = kchan->enabled; + i++; + } + } + + /* TODO: Missing UST listing */ } /* - * process_client_msg - * - * 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. + * Fill lttng_event array of all events in the channel. + */ +static void list_lttng_events(struct ltt_kernel_channel *kchan, + struct lttng_event *events) +{ + /* + * TODO: This is ONLY kernel. Need UST support. + */ + int i = 0; + struct ltt_kernel_event *event; + + DBG("Listing events for channel %s", kchan->channel->name); + + /* Kernel channels */ + cds_list_for_each_entry(event, &kchan->events_list.head , list) { + strncpy(events[i].name, event->event->name, LTTNG_SYMBOL_NAME_LEN); + events[i].enabled = event->enabled; + switch (event->event->instrumentation) { + case LTTNG_KERNEL_TRACEPOINT: + events[i].type = LTTNG_EVENT_TRACEPOINT; + break; + case LTTNG_KERNEL_KPROBE: + case LTTNG_KERNEL_KRETPROBE: + events[i].type = LTTNG_EVENT_PROBE; + memcpy(&events[i].attr.probe, &event->event->u.kprobe, + sizeof(struct lttng_kernel_kprobe)); + break; + case LTTNG_KERNEL_FUNCTION: + events[i].type = LTTNG_EVENT_FUNCTION; + memcpy(&events[i].attr.ftrace, &event->event->u.ftrace, + sizeof(struct lttng_kernel_function)); + break; + } + i++; + } +} + +/* + * 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(struct command_ctx *cmd_ctx) { - int ret; + int ret = LTTCOMM_OK; DBG("Processing client command %d", cmd_ctx->lsm->cmd_type); @@ -1246,9 +1269,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) switch (cmd_ctx->lsm->cmd_type) { case LTTNG_CREATE_SESSION: case LTTNG_LIST_SESSIONS: - case LTTNG_LIST_EVENTS: case LTTNG_KERNEL_LIST_EVENTS: - case LTTNG_LIST_TRACEABLE_APPS: break; default: DBG("Getting session %s by name", cmd_ctx->lsm->session_name); @@ -1273,7 +1294,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx) */ switch (cmd_ctx->lsm->cmd_type) { case LTTNG_KERNEL_ADD_CONTEXT: - case LTTNG_KERNEL_CREATE_CHANNEL: case LTTNG_KERNEL_DISABLE_ALL_EVENT: case LTTNG_KERNEL_DISABLE_CHANNEL: case LTTNG_KERNEL_DISABLE_EVENT: @@ -1310,6 +1330,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } } +#ifdef DISABLED /* Connect to ust apps if available pid */ if (cmd_ctx->lsm->pid > 0) { /* Connect to app using ustctl API */ @@ -1319,6 +1340,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto error; } } +#endif /* DISABLED */ /* Process by command type */ switch (cmd_ctx->lsm->cmd_type) { @@ -1327,6 +1349,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) int found = 0, no_event = 0; struct ltt_kernel_channel *chan; struct ltt_kernel_event *event; + struct lttng_kernel_context ctx; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1339,22 +1362,29 @@ static int process_client_msg(struct command_ctx *cmd_ctx) no_event = 1; } + /* Create Kernel context */ + ctx.ctx = cmd_ctx->lsm->u.context.ctx.ctx; + ctx.u.perf_counter.type = cmd_ctx->lsm->u.context.ctx.u.perf_counter.type; + ctx.u.perf_counter.config = cmd_ctx->lsm->u.context.ctx.u.perf_counter.config; + strncpy(ctx.u.perf_counter.name, + cmd_ctx->lsm->u.context.ctx.u.perf_counter.name, + sizeof(ctx.u.perf_counter.name)); + if (strlen(cmd_ctx->lsm->u.context.channel_name) == 0) { /* Go over all channels */ DBG("Adding context to all channels"); cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) { if (no_event) { - ret = kernel_add_channel_context(chan, - &cmd_ctx->lsm->u.context.ctx); + ret = kernel_add_channel_context(chan, &ctx); if (ret < 0) { - continue; + ret = LTTCOMM_KERN_CONTEXT_FAIL; + goto error; } } else { event = get_kernel_event_by_name(cmd_ctx->lsm->u.context.event_name, chan); if (event != NULL) { - ret = kernel_add_event_context(event, - &cmd_ctx->lsm->u.context.ctx); + ret = kernel_add_event_context(event, &ctx); if (ret < 0) { ret = LTTCOMM_KERN_CONTEXT_FAIL; goto error; @@ -1373,8 +1403,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } if (no_event) { - ret = kernel_add_channel_context(chan, - &cmd_ctx->lsm->u.context.ctx); + ret = kernel_add_channel_context(chan, &ctx); if (ret < 0) { ret = LTTCOMM_KERN_CONTEXT_FAIL; goto error; @@ -1382,8 +1411,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } else { event = get_kernel_event_by_name(cmd_ctx->lsm->u.context.event_name, chan); if (event != NULL) { - ret = kernel_add_event_context(event, - &cmd_ctx->lsm->u.context.ctx); + ret = kernel_add_event_context(event, &ctx); if (ret < 0) { ret = LTTCOMM_KERN_CONTEXT_FAIL; goto error; @@ -1400,33 +1428,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx) ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_CREATE_CHANNEL: - { - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - /* Kernel tracer */ - DBG("Creating kernel channel"); - - ret = kernel_create_channel(cmd_ctx->session->kernel_session, - &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path); - if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; - goto error; - } - - ret = notify_kernel_pollfd(); - if (ret < 0) { - ret = LTTCOMM_FATAL; - goto error; - } - - ret = LTTCOMM_OK; - break; - } case LTTNG_KERNEL_DISABLE_CHANNEL: { struct ltt_kernel_channel *chan; @@ -1537,8 +1538,22 @@ static int process_client_msg(struct command_ctx *cmd_ctx) chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, cmd_ctx->session->kernel_session); if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; + /* Channel not found, creating it */ + DBG("Creating kernel channel"); + + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + + /* Notify kernel thread that there is a new channel */ + ret = notify_kernel_pollfd(); + if (ret < 0) { + ret = LTTCOMM_FATAL; + goto error; + } } else if (chan->enabled == 0) { ret = kernel_enable_channel(chan); if (ret < 0) { @@ -1555,8 +1570,10 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } case LTTNG_KERNEL_ENABLE_EVENT: { - struct ltt_kernel_channel *chan; + char *channel_name; + struct ltt_kernel_channel *kchan; struct ltt_kernel_event *ev; + struct lttng_channel *chan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1564,22 +1581,42 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } + channel_name = cmd_ctx->lsm->u.enable.channel_name; - ev = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, chan); + do { + kchan = get_kernel_channel_by_name(channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + DBG("Channel not found. Creating channel %s", channel_name); + + chan = init_default_channel(channel_name); + if (chan == NULL) { + ret = LTTCOMM_FATAL; + goto error; + } + + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + chan, cmd_ctx->session->path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + } + } while (kchan == NULL); + + ev = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan); if (ev == NULL) { DBG("Creating kernel event %s for channel %s.", - cmd_ctx->lsm->u.enable.event.name, chan->channel->name); - ret = kernel_create_event(&cmd_ctx->lsm->u.enable.event, chan); + cmd_ctx->lsm->u.enable.event.name, channel_name); + ret = kernel_create_event(&cmd_ctx->lsm->u.enable.event, kchan); } else { DBG("Enabling kernel event %s for channel %s.", - cmd_ctx->lsm->u.enable.event.name, chan->channel->name); + cmd_ctx->lsm->u.enable.event.name, channel_name); ret = kernel_enable_event(ev); + if (ret == -EEXIST) { + ret = LTTCOMM_KERN_EVENT_EXIST; + goto error; + } } if (ret < 0) { @@ -1593,11 +1630,12 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } case LTTNG_KERNEL_ENABLE_ALL_EVENT: { - int pos, size; - char *event_list, *event, *ptr; - struct ltt_kernel_channel *chan; + int size, i; + char *channel_name; + struct ltt_kernel_channel *kchan; struct ltt_kernel_event *ev; - struct lttng_event ev_attr; + struct lttng_event *event_list; + struct lttng_channel *chan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1607,17 +1645,33 @@ static int process_client_msg(struct command_ctx *cmd_ctx) DBG("Enabling all kernel event"); - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } + channel_name = cmd_ctx->lsm->u.enable.channel_name; + + do { + kchan = get_kernel_channel_by_name(channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + DBG("Channel not found. Creating channel %s", channel_name); + + chan = init_default_channel(channel_name); + if (chan == NULL) { + ret = LTTCOMM_FATAL; + goto error; + } + + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + chan, cmd_ctx->session->path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + } + } while (kchan == NULL); /* For each event in the kernel session */ - cds_list_for_each_entry(ev, &chan->events_list.head, list) { + cds_list_for_each_entry(ev, &kchan->events_list.head, list) { DBG("Enabling kernel event %s for channel %s.", - ev->event->name, chan->channel->name); + ev->event->name, channel_name); ret = kernel_enable_event(ev); if (ret < 0) { continue; @@ -1630,23 +1684,17 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto error; } - ptr = event_list; - while ((size = sscanf(ptr, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) { - ev = get_kernel_event_by_name(event, chan); + for (i = 0; i < size; i++) { + ev = get_kernel_event_by_name(event_list[i].name, kchan); if (ev == NULL) { - strncpy(ev_attr.name, event, LTTNG_SYM_NAME_LEN); /* Default event type for enable all */ - ev_attr.type = LTTNG_EVENT_TRACEPOINTS; + event_list[i].type = LTTNG_EVENT_TRACEPOINT; /* Enable each single tracepoint event */ - ret = kernel_create_event(&ev_attr, chan); + ret = kernel_create_event(&event_list[i], kchan); if (ret < 0) { /* Ignore error here and continue */ } } - - /* Move pointer to the next line */ - ptr += pos + 1; - free(event); } free(event_list); @@ -1658,12 +1706,12 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } case LTTNG_KERNEL_LIST_EVENTS: { - char *event_list; + struct lttng_event *events; ssize_t size = 0; DBG("Listing kernel events"); - size = kernel_list_events(kernel_tracer_fd, &event_list); + size = kernel_list_events(kernel_tracer_fd, &events); if (size < 0) { ret = LTTCOMM_KERN_LIST_FAIL; goto error; @@ -1673,15 +1721,16 @@ static int process_client_msg(struct command_ctx *cmd_ctx) * 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); + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_event) * size); if (ret < 0) { goto setup_error; } /* Copy event list into message payload */ - memcpy(cmd_ctx->llm->payload, event_list, size); + memcpy(cmd_ctx->llm->payload, events, + sizeof(struct lttng_event) * size); - free(event_list); + free(events); ret = LTTCOMM_OK; break; @@ -1850,108 +1899,145 @@ static int process_client_msg(struct command_ctx *cmd_ctx) break; } /* - case LTTNG_LIST_TRACES: + case UST_CREATE_TRACE: { - unsigned int trace_count; + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } - trace_count = get_trace_count_per_session(cmd_ctx->session); - if (trace_count == 0) { - ret = LTTCOMM_NO_TRACE; + ret = ust_create_trace(cmd_ctx); + if (ret < 0) { goto error; } - - ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_trace) * trace_count); + break; + } + case UST_START_TRACE: + { + ret = setup_lttng_msg(cmd_ctx, 0); if (ret < 0) { goto setup_error; } - get_traces_per_session(cmd_ctx->session, - (struct lttng_trace *)(cmd_ctx->llm->payload)); - - ret = LTTCOMM_OK; + ret = ust_start_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; + } break; } - */ - /* - case UST_CREATE_TRACE: + case UST_STOP_TRACE: { ret = setup_lttng_msg(cmd_ctx, 0); if (ret < 0) { goto setup_error; } - ret = ust_create_trace(cmd_ctx); + ret = ust_stop_trace(cmd_ctx); if (ret < 0) { - goto error; + goto setup_error; } break; } */ - case LTTNG_LIST_TRACEABLE_APPS: + case LTTNG_LIST_DOMAINS: { - unsigned int app_count; + size_t nb_dom = 0; - app_count = get_app_count(); - DBG("Traceable application count : %d", app_count); - if (app_count == 0) { - ret = LTTCOMM_NO_APPS; - goto error; + if (cmd_ctx->session->kernel_session != NULL) { + nb_dom++; } - ret = setup_lttng_msg(cmd_ctx, sizeof(pid_t) * app_count); + nb_dom += cmd_ctx->session->ust_trace_count; + + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_domain) * nb_dom); if (ret < 0) { goto setup_error; } - get_app_list_pids((pid_t *)(cmd_ctx->llm->payload)); + ((struct lttng_domain *)(cmd_ctx->llm->payload))[0].type = + LTTNG_DOMAIN_KERNEL; + /* TODO: User-space tracer domain support */ ret = LTTCOMM_OK; break; } - /* - case UST_START_TRACE: + case LTTNG_LIST_CHANNELS: { - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + /* + * TODO: Only kernel channels are listed here. UST listing + * is needed on lttng-ust 2.0 release. + */ + size_t nb_chan = 0; + if (cmd_ctx->session->kernel_session != NULL) { + nb_chan += cmd_ctx->session->kernel_session->channel_count; } - ret = ust_start_trace(cmd_ctx); + ret = setup_lttng_msg(cmd_ctx, + sizeof(struct lttng_channel) * nb_chan); if (ret < 0) { goto setup_error; } + + list_lttng_channels(cmd_ctx->session, + (struct lttng_channel *)(cmd_ctx->llm->payload)); + + ret = LTTCOMM_OK; break; } - case UST_STOP_TRACE: + case LTTNG_LIST_EVENTS: { - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + /* + * TODO: Only kernel events are listed here. UST listing + * is needed on lttng-ust 2.0 release. + */ + size_t nb_event = 0; + struct ltt_kernel_channel *kchan = NULL; + + if (cmd_ctx->session->kernel_session != NULL) { + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.list.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + ret = LTTCOMM_KERN_CHAN_NOT_FOUND; + goto error; + } + nb_event += kchan->event_count; } - ret = ust_stop_trace(cmd_ctx); + ret = setup_lttng_msg(cmd_ctx, + sizeof(struct lttng_event) * nb_event); if (ret < 0) { goto setup_error; } + + DBG("Listing events (%ld events)", nb_event); + + list_lttng_events(kchan, + (struct lttng_event *)(cmd_ctx->llm->payload)); + + ret = LTTCOMM_OK; break; } - */ case LTTNG_LIST_SESSIONS: { - unsigned int session_count; + lock_session_list(); - session_count = get_session_count(); - if (session_count == 0) { + if (session_list_ptr->count == 0) { ret = LTTCOMM_NO_SESSION; + unlock_session_list(); goto error; } - ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * session_count); + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * + session_list_ptr->count); if (ret < 0) { + unlock_session_list(); goto setup_error; } - get_lttng_session((struct lttng_session *)(cmd_ctx->llm->payload)); + /* Filled the session array */ + list_lttng_sessions((struct lttng_session *)(cmd_ctx->llm->payload)); + + unlock_session_list(); ret = LTTCOMM_OK; break; @@ -1994,10 +2080,8 @@ setup_error: } /* - * thread_manage_clients - * - * This thread manage all clients request using the unix - * client socket for communication. + * This thread manage all clients request using the unix client socket for + * communication. */ static void *thread_manage_clients(void *data) { @@ -2081,7 +2165,7 @@ static void *thread_manage_clients(void *data) /* 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); + clean_command_ctx(&cmd_ctx); continue; } @@ -2092,7 +2176,7 @@ static void *thread_manage_clients(void *data) ERR("Failed to send data back to client"); } - clean_command_ctx(cmd_ctx); + clean_command_ctx(&cmd_ctx); /* End of transmission */ close(sock); @@ -2109,7 +2193,7 @@ error: unlink(client_unix_sock_path); - clean_command_ctx(cmd_ctx); + clean_command_ctx(&cmd_ctx); return NULL; } @@ -2200,7 +2284,8 @@ static int parse_args(int argc, char **argv) opt_quiet = 1; break; case 'v': - opt_verbose = 1; + /* Verbose level can increase using multiple -v */ + opt_verbose += 1; break; default: /* Unknown option or other error. @@ -2213,9 +2298,7 @@ static int parse_args(int argc, char **argv) } /* - * init_daemon_socket - * - * Creates the two needed socket by the daemon. + * Creates the two needed socket by the daemon. * apps_sock - The communication socket for all UST apps. * client_sock - The communication of the cli tool (lttng). */ @@ -2264,10 +2347,7 @@ end: } /* - * check_existing_daemon - * - * Check if the global socket is available. - * If yes, error is returned. + * Check if the global socket is available. If yes, error is returned. */ static int check_existing_daemon() { @@ -2282,12 +2362,10 @@ static int check_existing_daemon() } /* - * 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 - * more permissive (root.root) to les permissive (root.tracing). + * Race window between mkdir and chown is OK because we are going from more + * permissive (root.root) to les permissive (root.tracing). */ static int set_permissions(void) { @@ -2338,9 +2416,7 @@ end: } /* - * create_kernel_poll_pipe - * - * Create the pipe used to wake up the kernel thread. + * Create the pipe used to wake up the kernel thread. */ static int create_kernel_poll_pipe(void) { @@ -2348,10 +2424,7 @@ static int create_kernel_poll_pipe(void) } /* - * create_lttng_rundir - * - * Create the lttng run directory needed for all - * global sockets and pipe. + * Create the lttng run directory needed for all global sockets and pipe. */ static int create_lttng_rundir(void) { @@ -2372,10 +2445,8 @@ error: } /* - * set_kconsumerd_sockets - * - * Setup sockets and directory needed by the kconsumerd - * communication with the session daemon. + * Setup sockets and directory needed by the kconsumerd communication with the + * session daemon. */ static int set_kconsumerd_sockets(void) { @@ -2419,9 +2490,7 @@ error: } /* - * sighandler - * - * Signal handler for the daemon + * Signal handler for the daemon */ static void sighandler(int sig) { @@ -2445,9 +2514,7 @@ static void sighandler(int sig) } /* - * set_signal_handler - * - * Setup signal handler for : + * Setup signal handler for : * SIGINT, SIGTERM, SIGPIPE */ static int set_signal_handler(void) @@ -2485,16 +2552,15 @@ static int set_signal_handler(void) } /* - * set_ulimit - * - * Set open files limit to unlimited. This daemon can open a large number of - * file descriptors in order to consumer multiple kernel traces. + * Set open files limit to unlimited. This daemon can open a large number of + * file descriptors in order to consumer multiple kernel traces. */ static void set_ulimit(void) { int ret; struct rlimit lim; + /* The kernel does not allowed an infinite limit for open files */ lim.rlim_cur = 65535; lim.rlim_max = 65535; @@ -2515,14 +2581,13 @@ int main(int argc, char **argv) /* Create thread quit pipe */ if (init_thread_quit_pipe() < 0) { - /* No goto error because nothing is initialized at this point */ - exit(EXIT_FAILURE); + goto exit; } /* Parse arguments */ progname = argv[0]; if ((ret = parse_args(argc, argv) < 0)) { - goto error; + goto exit; } /* Daemonize */ @@ -2530,7 +2595,7 @@ int main(int argc, char **argv) ret = daemon(0, 0); if (ret < 0) { perror("daemon"); - goto error; + goto exit; } } @@ -2540,7 +2605,7 @@ int main(int argc, char **argv) if (is_root) { ret = create_lttng_rundir(); if (ret < 0) { - goto error; + goto exit; } if (strlen(apps_unix_sock_path) == 0) { @@ -2552,23 +2617,12 @@ int main(int argc, char **argv) snprintf(client_unix_sock_path, PATH_MAX, DEFAULT_GLOBAL_CLIENT_UNIX_SOCK); } - - ret = set_kconsumerd_sockets(); - if (ret < 0) { - goto error; - } - - /* Setup kernel tracer */ - init_kernel_tracer(); - - /* Set ulimit for open files */ - set_ulimit(); } else { home_path = get_home_dir(); if (home_path == NULL) { /* TODO: Add --socket PATH option */ ERR("Can't get HOME directory for sockets creation."); - goto error; + goto exit; } if (strlen(apps_unix_sock_path) == 0) { @@ -2594,10 +2648,31 @@ int main(int argc, char **argv) if ((ret = check_existing_daemon()) == 0) { ERR("Already running daemon.\n"); /* - * We do not goto error because we must not - * cleanup() because a daemon is already running. + * We do not goto error because we must not cleanup() because a daemon + * is already running. */ - exit(EXIT_FAILURE); + goto exit; + } + + /* After this point, we can safely call cleanup() so goto error is used */ + + /* + * These actions must be executed as root. We do that *after* setting up + * the sockets path because we MUST make the check for another daemon using + * those paths *before* trying to set the kernel consumer sockets and init + * kernel tracer. + */ + if (is_root) { + ret = set_kconsumerd_sockets(); + if (ret < 0) { + goto error; + } + + /* Setup kernel tracer */ + init_kernel_tracer(); + + /* Set ulimit for open files */ + set_ulimit(); } if (set_signal_handler() < 0) { @@ -2664,5 +2739,7 @@ int main(int argc, char **argv) error: cleanup(); + +exit: exit(EXIT_FAILURE); }