X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=7603ffd1417e466f60847c7173092e24038ffc35;hp=75a793164d4f70843bb176ce9897522f7f811b02;hb=ed8f384d7db2a09cdbd651c0298bfa31992b5a2e;hpb=a88df331a1ef01cb387fe09dfa830c2fa3501fbc diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 75a793164..7603ffd14 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) { @@ -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). * - * 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. - * - * 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,7 +1123,7 @@ static struct lttng_channel *init_default_channel(void) goto error; } - if (snprintf(chan->name, NAME_MAX, DEFAULT_CHANNEL_NAME) < 0) { + if (snprintf(chan->name, NAME_MAX, "%s", name) < 0) { perror("snprintf defautl 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,44 @@ static int create_kernel_session(struct ltt_session *session) } } - DBG("Creating default kernel channel %s", DEFAULT_CHANNEL_NAME); - - ret = kernel_create_channel(session->kernel_session, chan, session->path); - if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; - goto error; - } - - ret = notify_kernel_pollfd(); - error: return ret; } /* - * process_client_msg + * Using the session list, filled a lttng_session array to send back to the + * client for session listing. * - * 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. + * 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++; + } +} + +/* + * 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); @@ -1273,7 +1234,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 +1270,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 +1280,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 +1289,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 +1302,28 @@ 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; } } 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 +1342,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 +1350,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 +1367,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 +1477,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 +1509,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 +1520,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; + + 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, chan); + 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) { @@ -1594,10 +1570,11 @@ 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; + char *event_list, *event, *ptr, *channel_name; + struct ltt_kernel_channel *kchan; struct ltt_kernel_event *ev; struct lttng_event ev_attr; + struct lttng_channel *chan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1607,17 +1584,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; @@ -1632,13 +1625,13 @@ static int process_client_msg(struct command_ctx *cmd_ctx) ptr = event_list; while ((size = sscanf(ptr, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) { - ev = get_kernel_event_by_name(event, chan); + ev = get_kernel_event_by_name(event, 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; + ev_attr.type = LTTNG_EVENT_TRACEPOINT; /* Enable each single tracepoint event */ - ret = kernel_create_event(&ev_attr, chan); + ret = kernel_create_event(&ev_attr, kchan); if (ret < 0) { /* Ignore error here and continue */ } @@ -1938,20 +1931,23 @@ static int process_client_msg(struct command_ctx *cmd_ctx) */ 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; 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) { 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 +1990,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 +2075,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 +2086,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 +2103,7 @@ error: unlink(client_unix_sock_path); - clean_command_ctx(cmd_ctx); + clean_command_ctx(&cmd_ctx); return NULL; } @@ -2200,7 +2194,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 +2208,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 +2257,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 +2272,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 +2326,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 +2334,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 +2355,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 +2400,7 @@ error: } /* - * sighandler - * - * Signal handler for the daemon + * Signal handler for the daemon */ static void sighandler(int sig) { @@ -2445,9 +2424,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,10 +2462,8 @@ 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) {