X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=5a73b68dfed46fb8c1878725b3727bb2c16e2787;hp=39dfbc41d9254e27dd3a3ea4262e78608ce82126;hb=8b270bdb4dccf5571180a9906084126e90eec949;hpb=e6ddca715d6dedb6ee25fe4392a6e1f9626b2544 diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 39dfbc41d..5a73b68df 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -1,10 +1,11 @@ /* * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 - Mathieu Desnoyers * * 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 @@ -40,8 +41,9 @@ #include /* URCU list library (-lurcu) */ #include +#include -#include "liblttsessiondcomm.h" +#include "context.h" #include "ltt-sessiond.h" #include "lttngerr.h" #include "kernel-ctl.h" @@ -51,13 +53,6 @@ #include "lttng-kconsumerd.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; @@ -66,7 +61,9 @@ const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE; /* Variables */ int opt_verbose; /* Not static for lttngerr.h */ +int opt_verbose_kconsumerd; /* 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; @@ -104,6 +101,8 @@ static sem_t kconsumerd_sem; static pthread_mutex_t kconsumerd_pid_mutex; /* Mutex to control kconsumerd pid assignation */ +static int modprobe_remove_kernel_modules(void); + /* * Pointer initialized before thread creation. * @@ -111,10 +110,27 @@ 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; +static gid_t allowed_group(void) +{ + struct group *grp; + + if (opt_tracing_group) { + grp = getgrnam(opt_tracing_group); + } else { + grp = getgrnam(default_tracing_group); + } + if (!grp) { + return -1; + } else { + return grp->gr_gid; + } +} + /* * Init quit pipe. * @@ -135,10 +151,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) { @@ -150,14 +164,22 @@ static void teardown_kernel_session(struct ltt_session *session) } } +static void stop_threads(void) +{ + /* Stopping all threads */ + DBG("Terminating all threads"); + close(thread_quit_pipe[0]); + close(thread_quit_pipe[1]); +} + /* - * Cleanup the daemon + * Cleanup the daemon */ -static void cleanup() +static void cleanup(void) { int ret; char *cmd; - struct ltt_session *sess; + struct ltt_session *sess, *stmp; DBG("Cleaning up"); @@ -167,11 +189,6 @@ static void cleanup() 27, 1, 31, 27, 0, 27, 1, 33, 27, 0); /* */ - /* Stopping all threads */ - DBG("Terminating all threads"); - close(thread_quit_pipe[0]); - close(thread_quit_pipe[1]); - DBG("Removing %s directory", LTTNG_RUNDIR); ret = asprintf(&cmd, "rm -rf " LTTNG_RUNDIR); if (ret < 0) { @@ -191,7 +208,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) } @@ -201,14 +218,15 @@ static void cleanup() DBG("Closing kernel fd"); close(kernel_tracer_fd); + + DBG("Unloading kernel modules"); + modprobe_remove_kernel_modules(); } /* - * 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) { @@ -221,9 +239,7 @@ 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) { @@ -241,9 +257,7 @@ static void clean_command_ctx(struct command_ctx **cmd_ctx) } /* - * 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) { @@ -274,7 +288,9 @@ static int send_kconsumerd_channel_fds(int sock, struct ltt_kernel_channel *chan lkm.fd = stream->fd; lkm.state = stream->state; lkm.max_sb_size = channel->channel->attr.subbuf_size; + lkm.output = DEFAULT_KERNEL_CHANNEL_OUTPUT; strncpy(lkm.path_name, stream->pathname, PATH_MAX); + lkm.path_name[PATH_MAX - 1] = '\0'; DBG("Sending fd %d to kconsumerd", lkm.fd); @@ -295,9 +311,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) { @@ -325,7 +339,9 @@ static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) lkm.fd = session->metadata_stream_fd; lkm.state = ACTIVE_FD; lkm.max_sb_size = session->metadata->conf->attr.subbuf_size; + lkm.output = DEFAULT_KERNEL_CHANNEL_OUTPUT; strncpy(lkm.path_name, session->metadata->pathname, PATH_MAX); + lkm.path_name[PATH_MAX - 1] = '\0'; ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm)); if (ret < 0) { @@ -351,13 +367,10 @@ error: #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) { @@ -383,13 +396,11 @@ static int ust_connect_app(pid_t pid) #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) { @@ -415,13 +426,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) { @@ -438,7 +447,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; @@ -450,10 +459,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) { @@ -523,12 +530,10 @@ error: } /* - * 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) { @@ -577,12 +582,10 @@ end: } /* - * 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) { @@ -663,10 +666,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) { @@ -759,8 +759,6 @@ error: } /* - * thread_manage_apps - * * This thread manage the application socket communication */ static void *thread_manage_apps(void *data) @@ -858,10 +856,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,21 +887,33 @@ error: return ret; } +static int join_kconsumerd_thread(void) +{ + void *status; + int ret; + + if (kconsumerd_pid != 0) { + ret = kill(kconsumerd_pid, SIGTERM); + if (ret) { + ERR("Error killing kconsumerd"); + return ret; + } + return pthread_join(kconsumerd_thread, &status); + } else { + return 0; + } +} + /* - * 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"); @@ -914,7 +922,12 @@ static pid_t spawn_kconsumerd(void) /* * Exec kconsumerd. */ - execlp("ltt-kconsumerd", "ltt-kconsumerd", "--verbose", NULL); + if (opt_verbose > 1 || opt_verbose_kconsumerd) { + verbosity = "--verbose"; + } else { + verbosity = "--quiet"; + } + execl(INSTALL_BIN_PATH "/ltt-kconsumerd", "ltt-kconsumerd", verbosity, NULL); if (errno != 0) { perror("kernel start consumer exec"); } @@ -933,9 +946,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) { @@ -976,26 +987,71 @@ error: } /* - * modprobe_kernel_modules + * modprobe_kernel_modules */ static int modprobe_kernel_modules(void) { - int ret = 0, i = 0; + int ret = 0, i; char modprobe[256]; - while (kernel_modules_list[i] != NULL) { - ret = snprintf(modprobe, sizeof(modprobe), "/sbin/modprobe %s", - kernel_modules_list[i]); + for (i = 0; i < ARRAY_SIZE(kernel_modules_list); i++) { + ret = snprintf(modprobe, sizeof(modprobe), + "/sbin/modprobe %s%s", + kernel_modules_list[i].required ? "" : "--quiet ", + kernel_modules_list[i].name); if (ret < 0) { perror("snprintf modprobe"); goto error; } + modprobe[sizeof(modprobe) - 1] = '\0'; ret = system(modprobe); + if (ret == -1) { + ERR("Unable to launch modprobe for module %s", + kernel_modules_list[i].name); + } else if (kernel_modules_list[i].required + && WEXITSTATUS(ret) != 0) { + ERR("Unable to load module %s", + kernel_modules_list[i].name); + } else { + DBG("Modprobe successfully %s", + kernel_modules_list[i].name); + } + } + +error: + return ret; +} + +/* + * modprobe_remove_kernel_modules + * Remove modules in reverse load order. + */ +static int modprobe_remove_kernel_modules(void) +{ + int ret = 0, i; + char modprobe[256]; + + for (i = ARRAY_SIZE(kernel_modules_list) - 1; i >= 0; i--) { + ret = snprintf(modprobe, sizeof(modprobe), + "/sbin/modprobe --remove --quiet %s", + kernel_modules_list[i].name); if (ret < 0) { - ERR("Unable to load module %s", kernel_modules_list[i]); + perror("snprintf modprobe --remove"); + goto error; + } + modprobe[sizeof(modprobe) - 1] = '\0'; + ret = system(modprobe); + if (ret == -1) { + ERR("Unable to launch modprobe --remove for module %s", + kernel_modules_list[i].name); + } else if (kernel_modules_list[i].required + && WEXITSTATUS(ret) != 0) { + ERR("Unable to remove module %s", + kernel_modules_list[i].name); + } else { + DBG("Modprobe removal successful %s", + kernel_modules_list[i].name); } - DBG("Modprobe successfully %s", kernel_modules_list[i]); - i++; } error: @@ -1003,14 +1059,14 @@ error: } /* - * mount_debugfs + * mount_debugfs */ static int mount_debugfs(char *path) { int ret; char *type = "debugfs"; - ret = mkdir_recursive(path, S_IRWXU | S_IRWXG); + ret = mkdir_recursive(path, S_IRWXU | S_IRWXG, geteuid(), getegid()); if (ret < 0) { goto error; } @@ -1028,9 +1084,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) { @@ -1111,14 +1165,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); @@ -1152,11 +1204,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; @@ -1166,8 +1216,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; } @@ -1183,14 +1233,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"); @@ -1200,30 +1247,22 @@ static int create_kernel_session(struct ltt_session *session) goto error; } - chan = init_default_channel(); - if (chan == NULL) { - ret = LTTCOMM_FATAL; + ret = asprintf(&session->kernel_session->trace_path, "%s/kernel", + session->path); + if (ret < 0) { + perror("asprintf kernel traces path"); goto error; } - ret = mkdir_recursive(session->path, S_IRWXU | S_IRWXG ); + ret = mkdir_recursive(session->kernel_session->trace_path, + S_IRWXU | S_IRWXG, geteuid(), allowed_group()); if (ret < 0) { - if (ret != EEXIST) { + if (ret != -EEXIST) { ERR("Trace directory creation error"); goto error; } } - 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; } @@ -1247,40 +1286,104 @@ static void list_lttng_sessions(struct lttng_session *sessions) */ cds_list_for_each_entry(session, &session_list_ptr->head, list) { strncpy(sessions[i].path, session->path, PATH_MAX); + sessions[i].path[PATH_MAX - 1] = '\0'; strncpy(sessions[i].name, session->name, NAME_MAX); + sessions[i].name[NAME_MAX - 1] = '\0'; i++; } } /* - * 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_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; + + 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 */ +} + +/* + * 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].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + 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); - /* Listing commands don't need a session */ + /* + * Commands that DO NOT need a session. + */ 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: + case LTTNG_LIST_TRACEPOINTS: + case LTTNG_CALIBRATE: break; default: - DBG("Getting session %s by name", cmd_ctx->lsm->session_name); - cmd_ctx->session = find_session_by_name(cmd_ctx->lsm->session_name); + DBG("Getting session %s by name", cmd_ctx->lsm->session.name); + cmd_ctx->session = find_session_by_name(cmd_ctx->lsm->session.name); if (cmd_ctx->session == NULL) { /* If session name not found */ - if (cmd_ctx->lsm->session_name != NULL) { + if (cmd_ctx->lsm->session.name != NULL) { ret = LTTCOMM_SESS_NOT_FOUND; } else { /* If no session name specified */ ret = LTTCOMM_SELECT_SESS; @@ -1294,18 +1397,10 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } /* - * Check kernel command for kernel session. + * Check domain type for specific "pre-action". */ - 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: - case LTTNG_KERNEL_ENABLE_ALL_EVENT: - case LTTNG_KERNEL_ENABLE_CHANNEL: - case LTTNG_KERNEL_ENABLE_EVENT: - case LTTNG_KERNEL_LIST_EVENTS: + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: /* Kernel tracer check */ if (kernel_tracer_fd == 0) { init_kernel_tracer(); @@ -1316,44 +1411,39 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } /* Need a session for kernel command */ - if (cmd_ctx->lsm->cmd_type != LTTNG_KERNEL_LIST_EVENTS && - cmd_ctx->session->kernel_session == NULL) { - - ret = create_kernel_session(cmd_ctx->session); - if (ret < 0) { - ret = LTTCOMM_KERN_SESS_FAIL; - goto error; - } - - /* Start the kernel consumer daemon */ - if (kconsumerd_pid == 0) { - ret = start_kconsumerd(); + switch (cmd_ctx->lsm->cmd_type) { + case LTTNG_CREATE_SESSION: + case LTTNG_LIST_SESSIONS: + case LTTNG_LIST_TRACEPOINTS: + case LTTNG_CALIBRATE: + break; + default: + if (cmd_ctx->session->kernel_session == NULL) { + ret = create_kernel_session(cmd_ctx->session); if (ret < 0) { + ret = LTTCOMM_KERN_SESS_FAIL; goto error; } - } - } - } -#ifdef DISABLED - /* 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; + /* Start the kernel consumer daemon */ + if (kconsumerd_pid == 0) { + ret = start_kconsumerd(); + if (ret < 0) { + goto error; + } + } + } } + break; + default: + break; } -#endif /* DISABLED */ /* Process by command type */ switch (cmd_ctx->lsm->cmd_type) { - case LTTNG_KERNEL_ADD_CONTEXT: + case LTTNG_ADD_CONTEXT: { - int found = 0, no_event = 0; - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *event; + struct lttng_kernel_context kctx; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1361,102 +1451,75 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - /* Check if event name is given */ - if (strlen(cmd_ctx->lsm->u.context.event_name) == 0) { - no_event = 1; - } - - 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); - 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); - if (ret < 0) { - ret = LTTCOMM_KERN_CONTEXT_FAIL; - goto error; - } - found = 1; - break; - } - } - } - } else { - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.context.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + /* Create Kernel context */ + kctx.ctx = cmd_ctx->lsm->u.context.ctx.ctx; + kctx.u.perf_counter.type = cmd_ctx->lsm->u.context.ctx.u.perf_counter.type; + kctx.u.perf_counter.config = cmd_ctx->lsm->u.context.ctx.u.perf_counter.config; + strncpy(kctx.u.perf_counter.name, + cmd_ctx->lsm->u.context.ctx.u.perf_counter.name, + LTTNG_SYMBOL_NAME_LEN); + kctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + + /* Add kernel context to kernel tracer. See context.c */ + ret = add_kernel_context(cmd_ctx->session->kernel_session, &kctx, + cmd_ctx->lsm->u.context.event_name, + cmd_ctx->lsm->u.context.channel_name); + if (ret != LTTCOMM_OK) { goto error; } - - if (no_event) { - ret = kernel_add_channel_context(chan, - &cmd_ctx->lsm->u.context.ctx); - if (ret < 0) { - 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); - if (ret < 0) { - ret = LTTCOMM_KERN_CONTEXT_FAIL; - goto error; - } - } - } - } - - if (!found && !no_event) { - ret = LTTCOMM_NO_EVENT; + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; goto error; } ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_CREATE_CHANNEL: + case LTTNG_DISABLE_CHANNEL: { + struct ltt_kernel_channel *kchan; + /* 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; + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + ret = LTTCOMM_KERN_CHAN_NOT_FOUND; + goto error; + } else if (kchan->enabled == 1) { + ret = kernel_disable_channel(kchan); + if (ret < 0) { + if (ret != EEXIST) { + ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL; + } + goto error; + } + } + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; goto error; } ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_DISABLE_CHANNEL: + case LTTNG_DISABLE_EVENT: { - struct ltt_kernel_channel *chan; + struct ltt_kernel_channel *kchan; + struct ltt_kernel_event *kevent; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1464,29 +1527,41 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } else if (chan->enabled == 1) { - ret = kernel_disable_channel(chan); - if (ret < 0) { - if (ret != EEXIST) { - ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL; - } + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + ret = LTTCOMM_KERN_CHAN_NOT_FOUND; goto error; } + + kevent = get_kernel_event_by_name(cmd_ctx->lsm->u.disable.name, kchan); + if (kevent != NULL) { + DBG("Disabling kernel event %s for channel %s.", kevent->event->name, + kchan->channel->name); + ret = kernel_disable_event(kevent); + if (ret < 0) { + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; + } + } + + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_DISABLE_EVENT: + case LTTNG_DISABLE_ALL_EVENT: { - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; + struct ltt_kernel_channel *kchan; + struct ltt_kernel_event *kevent; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1494,32 +1569,41 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } - - ev = get_kernel_event_by_name(cmd_ctx->lsm->u.disable.name, chan); - if (ev != NULL) { - DBG("Disabling kernel event %s for channel %s.", - cmd_ctx->lsm->u.disable.name, cmd_ctx->lsm->u.disable.channel_name); - ret = kernel_disable_event(ev); - if (ret < 0) { - ret = LTTCOMM_KERN_ENABLE_FAIL; + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + DBG("Disabling all enabled kernel events"); + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + ret = LTTCOMM_KERN_CHAN_NOT_FOUND; goto error; } + + /* For each event in the kernel session */ + cds_list_for_each_entry(kevent, &kchan->events_list.head, list) { + DBG("Disabling kernel event %s for channel %s.", + kevent->event->name, kchan->channel->name); + ret = kernel_disable_event(kevent); + if (ret < 0) { + continue; + } + } + + /* Quiescent wait after event disable */ + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_DISABLE_ALL_EVENT: + case LTTNG_ENABLE_CHANNEL: { - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; + struct ltt_kernel_channel *kchan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1527,33 +1611,55 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - DBG("Disabling all enabled kernel events"); + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + /* Channel not found, creating it */ + DBG("Creating kernel channel"); - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + &cmd_ctx->lsm->u.channel.chan, + cmd_ctx->session->kernel_session->trace_path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } - /* For each event in the kernel session */ - cds_list_for_each_entry(ev, &chan->events_list.head, list) { - DBG("Disabling kernel event %s for channel %s.", - ev->event->name, cmd_ctx->lsm->u.disable.channel_name); - ret = kernel_disable_event(ev); - if (ret < 0) { - continue; + /* Notify kernel thread that there is a new channel */ + ret = notify_kernel_pollfd(); + if (ret < 0) { + ret = LTTCOMM_FATAL; + goto error; + } + } else if (kchan->enabled == 0) { + ret = kernel_enable_channel(kchan); + if (ret < 0) { + if (ret != EEXIST) { + ret = LTTCOMM_KERN_CHAN_ENABLE_FAIL; + } + goto error; + } } + + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - /* Quiescent wait after event disable */ - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_ENABLE_CHANNEL: + case LTTNG_ENABLE_EVENT: { - struct ltt_kernel_channel *chan; + char *channel_name; + struct ltt_kernel_channel *kchan; + struct ltt_kernel_event *kevent; + struct lttng_channel *chan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1561,70 +1667,69 @@ 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; - } else if (chan->enabled == 0) { - ret = kernel_enable_channel(chan); - if (ret < 0) { - if (ret != EEXIST) { - ret = LTTCOMM_KERN_CHAN_ENABLE_FAIL; - } - goto error; - } - } + channel_name = cmd_ctx->lsm->u.enable.channel_name; - kernel_wait_quiescent(kernel_tracer_fd); - ret = LTTCOMM_OK; - break; - } - case LTTNG_KERNEL_ENABLE_EVENT: - { - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + 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); - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } + chan = init_default_channel(channel_name); + if (chan == NULL) { + ret = LTTCOMM_FATAL; + goto 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; - } + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + chan, cmd_ctx->session->kernel_session->trace_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); - 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); - } else { - DBG("Enabling kernel event %s for channel %s.", - cmd_ctx->lsm->u.enable.event.name, chan->channel->name); - ret = kernel_enable_event(ev); - } + kevent = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan); + if (kevent == NULL) { + DBG("Creating kernel event %s for channel %s.", + 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.", + kevent->event->name, channel_name); + ret = kernel_enable_event(kevent); + if (ret == -EEXIST) { + ret = LTTCOMM_KERN_EVENT_EXIST; + goto error; + } + } - if (ret < 0) { - ret = LTTCOMM_KERN_ENABLE_FAIL; + if (ret < 0) { + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; + } + + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; goto error; } - - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_ENABLE_ALL_EVENT: + case LTTNG_ENABLE_ALL_EVENT: { - int pos, size; - char *event_list, *event, *ptr; - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; - struct lttng_event ev_attr; + int size, i; + char *channel_name; + struct ltt_kernel_channel *kchan; + struct ltt_kernel_event *kevent; + struct lttng_event *event_list; + struct lttng_channel *chan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1634,81 +1739,109 @@ 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; - /* For each event in the kernel session */ - cds_list_for_each_entry(ev, &chan->events_list.head, list) { - DBG("Enabling kernel event %s for channel %s.", - ev->event->name, chan->channel->name); - ret = kernel_enable_event(ev); - if (ret < 0) { - continue; - } - } + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + 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); - size = kernel_list_events(kernel_tracer_fd, &event_list); - if (size < 0) { - ret = LTTCOMM_KERN_LIST_FAIL; - goto error; - } + chan = init_default_channel(channel_name); + if (chan == NULL) { + ret = LTTCOMM_FATAL; + 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); - if (ev == NULL) { - strncpy(ev_attr.name, event, LTTNG_SYM_NAME_LEN); - /* Default event type for enable all */ - ev_attr.type = LTTNG_EVENT_TRACEPOINT; - /* Enable each single tracepoint event */ - ret = kernel_create_event(&ev_attr, chan); + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + chan, cmd_ctx->session->kernel_session->trace_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(kevent, &kchan->events_list.head, list) { + DBG("Enabling kernel event %s for channel %s.", + kevent->event->name, channel_name); + ret = kernel_enable_event(kevent); if (ret < 0) { - /* Ignore error here and continue */ + continue; } } - /* Move pointer to the next line */ - ptr += pos + 1; - free(event); - } + size = kernel_list_events(kernel_tracer_fd, &event_list); + if (size < 0) { + ret = LTTCOMM_KERN_LIST_FAIL; + goto error; + } - free(event_list); + for (i = 0; i < size; i++) { + kevent = get_kernel_event_by_name(event_list[i].name, kchan); + if (kevent == NULL) { + /* Default event type for enable all */ + event_list[i].type = LTTNG_EVENT_TRACEPOINT; + /* Enable each single tracepoint event */ + ret = kernel_create_event(&event_list[i], kchan); + if (ret < 0) { + /* Ignore error here and continue */ + } + } + } + + free(event_list); + + /* Quiescent wait after event enable */ + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; + } - /* Quiescent wait after event enable */ - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_LIST_EVENTS: + case LTTNG_LIST_TRACEPOINTS: { - char *event_list; - ssize_t size = 0; - - DBG("Listing kernel events"); - - size = kernel_list_events(kernel_tracer_fd, &event_list); - if (size < 0) { - ret = LTTCOMM_KERN_LIST_FAIL; - goto error; + struct lttng_event *events; + ssize_t nb_events = 0; + + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + DBG("Listing kernel events"); + nb_events = kernel_list_events(kernel_tracer_fd, &events); + if (nb_events < 0) { + ret = LTTCOMM_KERN_LIST_FAIL; + goto error; + } + break; + default: + /* TODO: Userspace listing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + break; } /* * 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) * nb_events); if (ret < 0) { + free(events); 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) * nb_events); - free(event_list); + free(events); ret = LTTCOMM_OK; break; @@ -1728,7 +1861,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) if (cmd_ctx->session->kernel_session->metadata == NULL) { DBG("Open kernel metadata"); ret = kernel_open_metadata(cmd_ctx->session->kernel_session, - cmd_ctx->session->path); + cmd_ctx->session->kernel_session->trace_path); if (ret < 0) { ret = LTTCOMM_KERN_META_FAIL; goto error; @@ -1748,7 +1881,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } /* For each channel */ - cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) { + cds_list_for_each_entry(chan, + &cmd_ctx->session->kernel_session->channel_list.head, list) { if (chan->stream_count == 0) { ret = kernel_open_channel_stream(chan); if (ret < 0) { @@ -1833,7 +1967,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - ret = create_session(cmd_ctx->lsm->session_name, cmd_ctx->lsm->path); + ret = create_session(cmd_ctx->lsm->session.name, cmd_ctx->lsm->session.path); if (ret < 0) { if (ret == -EEXIST) { ret = LTTCOMM_EXIST_SESS; @@ -1857,7 +1991,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) /* Clean kernel session teardown */ teardown_kernel_session(cmd_ctx->session); - ret = destroy_session(cmd_ctx->lsm->session_name); + ret = destroy_session(cmd_ctx->lsm->session.name); if (ret < 0) { ret = LTTCOMM_FATAL; goto error; @@ -1876,105 +2010,98 @@ static int process_client_msg(struct command_ctx *cmd_ctx) ret = LTTCOMM_OK; break; } - /* - case LTTNG_LIST_TRACES: + case LTTNG_LIST_DOMAINS: { - unsigned int trace_count; + size_t nb_dom = 0; - trace_count = get_trace_count_per_session(cmd_ctx->session); - if (trace_count == 0) { - ret = LTTCOMM_NO_TRACE; - goto error; + if (cmd_ctx->session->kernel_session != NULL) { + nb_dom++; } - ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_trace) * trace_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_traces_per_session(cmd_ctx->session, - (struct lttng_trace *)(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_CREATE_TRACE: + case LTTNG_LIST_CHANNELS: { - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - ret = ust_create_trace(cmd_ctx); - if (ret < 0) { - goto error; - } - break; - } - */ - case LTTNG_LIST_TRACEABLE_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 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 = setup_lttng_msg(cmd_ctx, sizeof(pid_t) * app_count); + ret = setup_lttng_msg(cmd_ctx, + sizeof(struct lttng_channel) * nb_chan); if (ret < 0) { goto setup_error; } - get_app_list_pids((pid_t *)(cmd_ctx->llm->payload)); + list_lttng_channels(cmd_ctx->session, + (struct lttng_channel *)(cmd_ctx->llm->payload)); ret = LTTCOMM_OK; break; } - /* - case UST_START_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; - ret = ust_start_trace(cmd_ctx); - if (ret < 0) { - goto setup_error; - } - break; - } - case UST_STOP_TRACE: - { - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + 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 (%zu events)", nb_event); + + list_lttng_events(kchan, + (struct lttng_event *)(cmd_ctx->llm->payload)); + + ret = LTTCOMM_OK; break; } - */ case LTTNG_LIST_SESSIONS: { lock_session_list(); 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_list_ptr->count); if (ret < 0) { + unlock_session_list(); goto setup_error; } @@ -1986,6 +2113,37 @@ static int process_client_msg(struct command_ctx *cmd_ctx) ret = LTTCOMM_OK; break; } + + case LTTNG_CALIBRATE: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + { + struct lttng_kernel_calibrate kcalibrate; + + kcalibrate.type = cmd_ctx->lsm->u.calibrate.type; + ret = kernel_calibrate(kernel_tracer_fd, &kcalibrate); + if (ret < 0) { + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; + } + break; + } + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; + } + ret = LTTCOMM_OK; + break; + } + default: /* Undefined command */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -2024,10 +2182,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) { @@ -2161,6 +2317,7 @@ static void usage(void) fprintf(stderr, " -S, --sig-parent Send SIGCHLD to parent pid to notify readiness.\n"); fprintf(stderr, " -q, --quiet No output at all.\n"); fprintf(stderr, " -v, --verbose Verbose mode. Activate DBG() macro.\n"); + fprintf(stderr, " --verbose-kconsumerd Verbose mode for kconsumerd. Activate DBG() macro.\n"); } /* @@ -2182,12 +2339,13 @@ static int parse_args(int argc, char **argv) { "version", 0, 0, 'V' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, + { "verbose-kconsumerd", 0, 0, 'Z' }, { NULL, 0, 0, 0 } }; while (1) { int option_index = 0; - c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:E:C:", long_options, &option_index); + c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:E:C:Z", long_options, &option_index); if (c == -1) { break; } @@ -2230,7 +2388,11 @@ 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; + case 'Z': + opt_verbose_kconsumerd += 1; break; default: /* Unknown option or other error. @@ -2243,13 +2405,11 @@ 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). */ -static int init_daemon_socket() +static int init_daemon_socket(void) { int ret = 0; mode_t old_umask; @@ -2294,42 +2454,34 @@ end: } /* - * check_existing_daemon - * - * Check if the global socket is available. - * If yes, error is returned. + * Check if the global socket is available, and if a daemon is answering + * at the other side. If yes, error is returned. */ -static int check_existing_daemon() +static int check_existing_daemon(void) { - int ret; - - ret = access(client_unix_sock_path, F_OK); - if (ret == 0) { - ret = access(apps_unix_sock_path, F_OK); - } - - return ret; + if (access(client_unix_sock_path, F_OK) < 0 && + access(apps_unix_sock_path, F_OK) < 0) + return 0; + /* Is there anybody out there ? */ + if (lttng_session_daemon_alive()) + return -EEXIST; + else + return 0; } /* - * 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) { int ret; - struct group *grp; - - /* Decide which group name to use */ - (opt_tracing_group != NULL) ? - (grp = getgrnam(opt_tracing_group)) : - (grp = getgrnam(default_tracing_group)); + gid_t gid; - if (grp == NULL) { + gid = allowed_group(); + if (gid < 0) { if (is_root) { WARN("No tracing group detected"); ret = 0; @@ -2341,21 +2493,21 @@ static int set_permissions(void) } /* Set lttng run dir */ - ret = chown(LTTNG_RUNDIR, 0, grp->gr_gid); + ret = chown(LTTNG_RUNDIR, 0, gid); if (ret < 0) { ERR("Unable to set group on " LTTNG_RUNDIR); perror("chown"); } /* lttng client socket path */ - ret = chown(client_unix_sock_path, 0, grp->gr_gid); + ret = chown(client_unix_sock_path, 0, gid); if (ret < 0) { ERR("Unable to set group on %s", client_unix_sock_path); perror("chown"); } /* kconsumerd error socket path */ - ret = chown(kconsumerd_err_unix_sock_path, 0, grp->gr_gid); + ret = chown(kconsumerd_err_unix_sock_path, 0, gid); if (ret < 0) { ERR("Unable to set group on %s", kconsumerd_err_unix_sock_path); perror("chown"); @@ -2368,9 +2520,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) { @@ -2378,10 +2528,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) { @@ -2402,10 +2549,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) { @@ -2449,35 +2594,32 @@ error: } /* - * sighandler + * Signal handler for the daemon * - * Signal handler for the daemon + * Simply stop all worker threads, leaving main() return gracefully + * after joining all threads and calling cleanup(). */ 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; + case SIGPIPE: + DBG("SIGPIPE catched"); + return; + case SIGINT: + DBG("SIGINT catched"); + stop_threads(); + break; + case SIGTERM: + DBG("SIGTERM catched"); + stop_threads(); + break; + default: + break; } - - exit(EXIT_SUCCESS); } /* - * set_signal_handler - * - * Setup signal handler for : + * Setup signal handler for : * SIGINT, SIGTERM, SIGPIPE */ static int set_signal_handler(void) @@ -2515,10 +2657,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) { @@ -2545,14 +2685,14 @@ int main(int argc, char **argv) const char *home_path; /* Create thread quit pipe */ - if (init_thread_quit_pipe() < 0) { - goto exit; + if ((ret = init_thread_quit_pipe()) < 0) { + goto error; } /* Parse arguments */ progname = argv[0]; if ((ret = parse_args(argc, argv) < 0)) { - goto exit; + goto error; } /* Daemonize */ @@ -2560,7 +2700,7 @@ int main(int argc, char **argv) ret = daemon(0, 0); if (ret < 0) { perror("daemon"); - goto exit; + goto error; } } @@ -2570,7 +2710,7 @@ int main(int argc, char **argv) if (is_root) { ret = create_lttng_rundir(); if (ret < 0) { - goto exit; + goto error; } if (strlen(apps_unix_sock_path) == 0) { @@ -2587,7 +2727,8 @@ int main(int argc, char **argv) if (home_path == NULL) { /* TODO: Add --socket PATH option */ ERR("Can't get HOME directory for sockets creation."); - goto exit; + ret = -EPERM; + goto error; } if (strlen(apps_unix_sock_path) == 0) { @@ -2606,17 +2747,15 @@ int main(int argc, char **argv) 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. However, if the daemon is killed - * with a SIGKILL, those unix socket must be unlinked by hand. + * See if daemon already exist. */ - if ((ret = check_existing_daemon()) == 0) { + 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 exit because we must not cleanup() + * because a daemon is already running. */ - goto exit; + goto error; } /* After this point, we can safely call cleanup() so goto error is used */ @@ -2630,7 +2769,7 @@ int main(int argc, char **argv) if (is_root) { ret = set_kconsumerd_sockets(); if (ret < 0) { - goto error; + goto exit; } /* Setup kernel tracer */ @@ -2640,18 +2779,18 @@ int main(int argc, char **argv) set_ulimit(); } - if (set_signal_handler() < 0) { - goto error; + if ((ret = set_signal_handler()) < 0) { + goto exit; } /* Setup the needed unix socket */ - if (init_daemon_socket() < 0) { - goto error; + if ((ret = init_daemon_socket()) < 0) { + goto exit; } /* Set credentials to socket */ - if (is_root && (set_permissions() < 0)) { - goto error; + if (is_root && ((ret = set_permissions()) < 0)) { + goto exit; } /* Get parent pid if -S, --sig-parent is specified. */ @@ -2660,8 +2799,8 @@ int main(int argc, char **argv) } /* Setup the kernel pipe for waking up the kernel thread */ - if (create_kernel_poll_pipe() < 0) { - goto error; + if ((ret = create_kernel_poll_pipe()) < 0) { + goto exit; } /* @@ -2670,41 +2809,61 @@ int main(int argc, char **argv) */ session_list_ptr = get_session_list(); - while (1) { - /* Create thread to manage the client socket */ - ret = pthread_create(&client_thread, NULL, thread_manage_clients, (void *) NULL); - if (ret != 0) { - perror("pthread_create"); - goto error; - } + /* Create thread to manage the client socket */ + ret = pthread_create(&client_thread, NULL, thread_manage_clients, (void *) NULL); + if (ret != 0) { + perror("pthread_create"); + goto exit_client; + } - /* Create thread to manage application socket */ - ret = pthread_create(&apps_thread, NULL, thread_manage_apps, (void *) NULL); - if (ret != 0) { - perror("pthread_create"); - goto error; - } + /* Create thread to manage application socket */ + ret = pthread_create(&apps_thread, NULL, thread_manage_apps, (void *) NULL); + if (ret != 0) { + perror("pthread_create"); + goto exit_apps; + } - /* Create kernel thread to manage kernel event */ - ret = pthread_create(&kernel_thread, NULL, thread_manage_kernel, (void *) NULL); - if (ret != 0) { - perror("pthread_create"); - goto error; - } + /* Create kernel thread to manage kernel event */ + ret = pthread_create(&kernel_thread, NULL, thread_manage_kernel, (void *) NULL); + if (ret != 0) { + perror("pthread_create"); + goto exit_kernel; + } - ret = pthread_join(client_thread, &status); - if (ret != 0) { - perror("pthread_join"); - goto error; - } + ret = pthread_join(kernel_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ } - cleanup(); - exit(EXIT_SUCCESS); +exit_kernel: + ret = pthread_join(apps_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ + } -error: - cleanup(); +exit_apps: + ret = pthread_join(client_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ + } + ret = join_kconsumerd_thread(); + if (ret != 0) { + perror("join_kconsumerd"); + goto error; /* join error, exit without cleanup */ + } + +exit_client: exit: + /* + * cleanup() is called when no other thread is running. + */ + cleanup(); + if (!ret) + exit(EXIT_SUCCESS); +error: exit(EXIT_FAILURE); }