X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=c72087ef25ddb88d27634e5d97d1967d1bec0277;hp=49842520dd70db2a5e034f2b21d4ab652e707e54;hb=7272acf55ec512708704dc5f1ad4f447e5b3ca8e;hpb=b579acd98eabe5875e3ee7975abe10d7ccf23e5c diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 49842520d..c72087ef2 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -1,19 +1,19 @@ /* * Copyright (C) 2011 - David Goulet + * 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; only version 2 - * of the License. + * 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; 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 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307, USA. */ #define _GNU_SOURCE @@ -21,36 +21,39 @@ #include #include #include -#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include #include -#include -#include +#include +#include #include -#include /* URCU list library (-lurcu) */ -#include +#include +#include +#include +#include +#include "channel.h" +#include "compat/poll.h" #include "context.h" -#include "liblttsessiondcomm.h" -#include "ltt-sessiond.h" -#include "lttngerr.h" +#include "event.h" +#include "futex.h" #include "kernel-ctl.h" +#include "ltt-sessiond.h" +#include "shm.h" +#include "ust-app.h" #include "ust-ctl.h" -#include "session.h" -#include "traceable-app.h" -#include "lttng-kconsumerd.h" #include "utils.h" +#include "ust-ctl.h" /* Const values */ const char default_home_dir[] = DEFAULT_HOME_DIR; @@ -60,6 +63,7 @@ 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; @@ -69,12 +73,17 @@ static int opt_daemon; static int is_root; /* Set to 1 if the daemon is running as root */ static pid_t ppid; /* Parent PID for --sig-parent option */ static pid_t kconsumerd_pid; -static struct pollfd *kernel_pollfd; - -static char apps_unix_sock_path[PATH_MAX]; /* Global application Unix socket path */ -static char client_unix_sock_path[PATH_MAX]; /* Global client Unix socket path */ -static char kconsumerd_err_unix_sock_path[PATH_MAX]; /* kconsumerd error Unix socket path */ -static char kconsumerd_cmd_unix_sock_path[PATH_MAX]; /* kconsumerd command Unix socket path */ +static int dispatch_thread_exit; + +/* Global application Unix socket path */ +static char apps_unix_sock_path[PATH_MAX]; +/* Global client Unix socket path */ +static char client_unix_sock_path[PATH_MAX]; +/* kconsumerd error and command Unix socket path */ +static char kconsumerd_err_unix_sock_path[PATH_MAX]; +static char kconsumerd_cmd_unix_sock_path[PATH_MAX]; +/* global wait shm path for UST */ +static char wait_shm_path[PATH_MAX]; /* Sockets and FDs */ static int client_sock; @@ -90,14 +99,33 @@ static int kernel_poll_pipe[2]; */ static int thread_quit_pipe[2]; +/* + * This pipe is used to inform the thread managing application communication + * that a command is queued and ready to be processed. + */ +static int apps_cmd_pipe[2]; + /* Pthread, Mutexes and Semaphores */ static pthread_t kconsumerd_thread; static pthread_t apps_thread; +static pthread_t reg_apps_thread; static pthread_t client_thread; static pthread_t kernel_thread; +static pthread_t dispatch_thread; static sem_t kconsumerd_sem; -static pthread_mutex_t kconsumerd_pid_mutex; /* Mutex to control kconsumerd pid assignation */ + +/* Mutex to control kconsumerd pid assignation */ +static pthread_mutex_t kconsumerd_pid_mutex; + +/* + * UST registration command queue. This queue is tied with a futex and uses a N + * wakers / 1 waiter implemented and detailed in futex.c/.h + * + * The thread_manage_apps and thread_dispatch_ust_registration interact with + * this queue and the wait/wake scheme. + */ +static struct ust_cmd_queue ust_cmd_queue; /* * Pointer initialized before thread creation. @@ -107,12 +135,110 @@ static pthread_mutex_t kconsumerd_pid_mutex; /* Mutex to control kconsumerd pid * MUST NOT be taken if you call a public function in session.c. * * The lock is nested inside the structure: session_list_ptr->lock. Please use - * lock_session_list and unlock_session_list for lock acquisition. + * session_lock_list and session_unlock_list for lock acquisition. */ static struct ltt_session_list *session_list_ptr; /* - * Init quit pipe. + * Create a poll set with O_CLOEXEC and add the thread quit pipe to the set. + */ +static int create_thread_poll_set(struct lttng_poll_event *events, + unsigned int size) +{ + int ret; + + if (events == NULL || size == 0) { + ret = -1; + goto error; + } + + ret = lttng_poll_create(events, size, LTTNG_CLOEXEC); + if (ret < 0) { + goto error; + } + + /* Add quit pipe */ + ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN); + if (ret < 0) { + goto error; + } + + return 0; + +error: + return ret; +} + +/* + * Check if the thread quit pipe was triggered. + * + * Return 1 if it was triggered else 0; + */ +static int check_thread_quit_pipe(int fd, uint32_t events) +{ + if (fd == thread_quit_pipe[0] && (events & LPOLLIN)) { + return 1; + } + + return 0; +} + +/* + * 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) { + 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); + } + } + +error: + return ret; +} + +/* + * Return group ID of the tracing group or -1 if not found. + */ +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 thread quit pipe. * * Return -1 on error or 0 if all pipes are created. */ @@ -138,16 +264,44 @@ static void teardown_kernel_session(struct ltt_session *session) { if (session->kernel_session != NULL) { DBG("Tearing down kernel session"); - trace_destroy_kernel_session(session->kernel_session); + + /* + * If a custom kernel consumer was registered, close the socket before + * tearing down the complete kernel session structure + */ + if (session->kernel_session->consumer_fd != kconsumerd_cmd_sock) { + lttcomm_close_unix_sock(session->kernel_session->consumer_fd); + } + + trace_kernel_destroy_session(session->kernel_session); /* Extra precaution */ session->kernel_session = NULL; } } +/* + * Stop all threads by closing the thread quit pipe. + */ +static void stop_threads(void) +{ + int ret; + + /* Stopping all threads */ + DBG("Terminating all threads"); + ret = notify_thread_pipe(thread_quit_pipe[1]); + if (ret < 0) { + ERR("write error on thread quit pipe"); + } + + /* Dispatch thread */ + dispatch_thread_exit = 1; + futex_nto1_wake(&ust_cmd_queue.futex); +} + /* * Cleanup the daemon */ -static void cleanup() +static void cleanup(void) { int ret; char *cmd; @@ -156,26 +310,23 @@ static void cleanup() DBG("Cleaning up"); /* */ - MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm%c[%d;%dm" + MSG("%c[%d;%dm*** assert failed *** ==> %c[%dm%c[%d;%dm" "Matthew, BEET driven development works!%c[%dm", 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) { - ERR("asprintf failed. Something is really wrong!"); - } + if (is_root) { + DBG("Removing %s directory", LTTNG_RUNDIR); + ret = asprintf(&cmd, "rm -rf " LTTNG_RUNDIR); + if (ret < 0) { + ERR("asprintf failed. Something is really wrong!"); + } - /* Remove lttng run directory */ - ret = system(cmd); - if (ret < 0) { - ERR("Unable to clean " LTTNG_RUNDIR); + /* Remove lttng run directory */ + ret = system(cmd); + if (ret < 0) { + ERR("Unable to clean " LTTNG_RUNDIR); + } } DBG("Cleaning up all session"); @@ -185,16 +336,28 @@ static void cleanup() pthread_mutex_destroy(&session_list_ptr->lock); /* Cleanup ALL session */ - cds_list_for_each_entry_safe(sess, stmp, &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) } } + DBG("Closing all UST sockets"); + ust_app_clean_list(); + pthread_mutex_destroy(&kconsumerd_pid_mutex); DBG("Closing kernel fd"); close(kernel_tracer_fd); + + if (is_root) { + DBG("Unloading kernel modules"); + modprobe_remove_kernel_modules(); + } + + close(thread_quit_pipe[0]); + close(thread_quit_pipe[1]); } /* @@ -233,7 +396,8 @@ static void clean_command_ctx(struct command_ctx **cmd_ctx) /* * Send all stream fds of kernel channel to the consumer. */ -static int send_kconsumerd_channel_fds(int sock, struct ltt_kernel_channel *channel) +static int send_kconsumerd_channel_fds(int sock, + struct ltt_kernel_channel *channel) { int ret; size_t nb_fd; @@ -241,7 +405,8 @@ static int send_kconsumerd_channel_fds(int sock, struct ltt_kernel_channel *chan struct lttcomm_kconsumerd_header lkh; struct lttcomm_kconsumerd_msg lkm; - DBG("Sending fds of channel %s to kernel consumer", channel->channel->name); + DBG("Sending fds of channel %s to kernel consumer", + channel->channel->name); nb_fd = channel->stream_count; @@ -251,7 +416,8 @@ static int send_kconsumerd_channel_fds(int sock, struct ltt_kernel_channel *chan DBG("Sending kconsumerd header"); - ret = lttcomm_send_unix_sock(sock, &lkh, sizeof(struct lttcomm_kconsumerd_header)); + ret = lttcomm_send_unix_sock(sock, &lkh, + sizeof(struct lttcomm_kconsumerd_header)); if (ret < 0) { perror("send kconsumerd header"); goto error; @@ -262,11 +428,14 @@ 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 = channel->channel->attr.output; strncpy(lkm.path_name, stream->pathname, PATH_MAX); + lkm.path_name[PATH_MAX - 1] = '\0'; DBG("Sending fd %d to kconsumerd", lkm.fd); - ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm)); + ret = lttcomm_send_fds_unix_sock(sock, &lkm, + &lkm.fd, 1, sizeof(lkm)); if (ret < 0) { perror("send kconsumerd fd"); goto error; @@ -285,7 +454,7 @@ error: /* * Send all stream fds of the kernel session to the consumer. */ -static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) +static int send_kconsumerd_fds(struct ltt_kernel_session *session) { int ret; struct ltt_kernel_channel *chan; @@ -298,7 +467,8 @@ static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) DBG("Sending kconsumerd header for metadata"); - ret = lttcomm_send_unix_sock(sock, &lkh, sizeof(struct lttcomm_kconsumerd_header)); + ret = lttcomm_send_unix_sock(session->consumer_fd, &lkh, + sizeof(struct lttcomm_kconsumerd_header)); if (ret < 0) { perror("send kconsumerd header"); goto error; @@ -306,14 +476,22 @@ static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) DBG("Sending metadata stream fd"); + /* Extra protection. It's NOT suppose to be set to 0 at this point */ + if (session->consumer_fd == 0) { + session->consumer_fd = kconsumerd_cmd_sock; + } + if (session->metadata_stream_fd != 0) { /* Send metadata stream fd first */ 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)); + ret = lttcomm_send_fds_unix_sock(session->consumer_fd, &lkm, + &lkm.fd, 1, sizeof(lkm)); if (ret < 0) { perror("send kconsumerd fd"); goto error; @@ -321,7 +499,7 @@ static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) } cds_list_for_each_entry(chan, &session->channel_list.head, list) { - ret = send_kconsumerd_channel_fds(sock, chan); + ret = send_kconsumerd_channel_fds(session->consumer_fd, chan); if (ret < 0) { goto error; } @@ -335,64 +513,29 @@ error: return ret; } -#ifdef DISABLED -/* - * Return a socket connected to the libust communication socket of the - * application identified by the pid. - * - * If the pid is not found in the traceable list, return -1 to indicate error. - */ -static int ust_connect_app(pid_t pid) -{ - int sock; - struct ltt_traceable_app *lta; - - DBG("Connect to application pid %d", pid); - - lta = find_app_by_pid(pid); - if (lta == NULL) { - /* App not found */ - DBG("Application pid %d not found", pid); - return -1; - } - - sock = ustctl_connect_pid(lta->pid); - if (sock < 0) { - ERR("Fail connecting to the PID %d", pid); - } - - return sock; -} -#endif /* DISABLED */ - /* - * 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. + * Notify UST applications using the shm mmap futex. */ -static int notify_apps(const char *name) +static int notify_ust_apps(int active) { - int fd; - int ret = -1; + char *wait_shm_mmap; - DBG("Notify the global application pipe"); + DBG("Notifying applications of session daemon state: %d", active); - /* Try opening the global pipe */ - fd = open(name, O_WRONLY); - if (fd < 0) { + /* See shm.c for this call implying mmap, shm and futex calls */ + wait_shm_mmap = shm_ust_get_mmap(wait_shm_path, is_root); + if (wait_shm_mmap == NULL) { goto error; } - /* Notify by writing on the pipe */ - ret = write(fd, "42", 2); - if (ret < 0) { - perror("write"); - } + /* Wake waiting process */ + futex_wait_update((int32_t *) wait_shm_mmap, active); + + /* Apps notified successfully */ + return 0; error: - return ret; + return -1; } /* @@ -429,78 +572,48 @@ error: } /* - * Update the kernel pollfd set of all channel fd available over all tracing + * Update the kernel poll 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) +static int update_kernel_poll(struct lttng_poll_event *events) { - int i = 0; - /* - * The wakup pipe and the quit pipe are needed so the number of fds starts - * at 2 for those pipes. - */ - unsigned int nb_fd = 2; + int ret; struct ltt_session *session; struct ltt_kernel_channel *channel; - DBG("Updating kernel_pollfd"); + DBG("Updating kernel poll set"); - /* Get the number of channel of all kernel session */ - lock_session_list(); + session_lock_list(); cds_list_for_each_entry(session, &session_list_ptr->head, list) { - lock_session(session); + session_lock(session); if (session->kernel_session == NULL) { - unlock_session(session); + session_unlock(session); continue; } - nb_fd += session->kernel_session->channel_count; - unlock_session(session); - } - - DBG("Resizing kernel_pollfd to size %d", nb_fd); - - kernel_pollfd = realloc(kernel_pollfd, nb_fd * sizeof(struct pollfd)); - if (kernel_pollfd == NULL) { - perror("malloc kernel_pollfd"); - goto error; - } - cds_list_for_each_entry(session, &session_list_ptr->head, list) { - lock_session(session); - if (session->kernel_session == NULL) { - unlock_session(session); - continue; - } - if (i >= nb_fd) { - ERR("To much channel for kernel_pollfd size"); - unlock_session(session); - break; - } - cds_list_for_each_entry(channel, &session->kernel_session->channel_list.head, list) { - kernel_pollfd[i].fd = channel->fd; - kernel_pollfd[i].events = POLLIN | POLLRDNORM; - i++; + cds_list_for_each_entry(channel, + &session->kernel_session->channel_list.head, list) { + /* Add channel fd to the kernel poll set */ + ret = lttng_poll_add(events, channel->fd, LPOLLIN | LPOLLRDNORM); + if (ret < 0) { + session_unlock(session); + goto error; + } + DBG("Channel fd %d added to kernel set", channel->fd); } - unlock_session(session); + session_unlock(session); } - unlock_session_list(); - - /* Adding wake up pipe */ - kernel_pollfd[nb_fd - 2].fd = kernel_poll_pipe[0]; - kernel_pollfd[nb_fd - 2].events = POLLIN; - - /* Adding the quit pipe */ - kernel_pollfd[nb_fd - 1].fd = thread_quit_pipe[0]; + session_unlock_list(); - return nb_fd; + return 0; error: - unlock_session_list(); + session_unlock_list(); return -1; } /* - * Find the channel fd from 'fd' over all tracing session. When found, check + * 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. @@ -513,41 +626,51 @@ static int update_kernel_stream(int fd) DBG("Updating kernel streams for channel fd %d", fd); - lock_session_list(); + session_lock_list(); cds_list_for_each_entry(session, &session_list_ptr->head, list) { - lock_session(session); + session_lock(session); if (session->kernel_session == NULL) { - unlock_session(session); + session_unlock(session); continue; } - cds_list_for_each_entry(channel, &session->kernel_session->channel_list.head, list) { + + /* This is not suppose to be 0 but this is an extra security check */ + if (session->kernel_session->consumer_fd == 0) { + session->kernel_session->consumer_fd = kconsumerd_cmd_sock; + } + + cds_list_for_each_entry(channel, + &session->kernel_session->channel_list.head, list) { if (channel->fd == fd) { DBG("Channel found, updating kernel streams"); ret = kernel_open_channel_stream(channel); if (ret < 0) { - goto end; + goto error; } + /* - * Have we already sent fds to the consumer? If yes, it means that - * tracing is started so it is safe to send our updated stream fds. + * Have we already sent fds to the consumer? If yes, it means + * that tracing is started so it is safe to send our updated + * stream fds. */ if (session->kernel_session->kconsumer_fds_sent == 1) { - ret = send_kconsumerd_channel_fds(kconsumerd_cmd_sock, channel); + ret = send_kconsumerd_channel_fds( + session->kernel_session->consumer_fd, channel); if (ret < 0) { - goto end; + goto error; } } - goto end; + goto error; } } - unlock_session(session); + session_unlock(session); } + session_unlock_list(); + return ret; -end: - unlock_session_list(); - if (session) { - unlock_session(session); - } +error: + session_unlock(session); + session_unlock_list(); return ret; } @@ -559,79 +682,93 @@ end: */ static void *thread_manage_kernel(void *data) { - int ret, i, nb_fd = 0; + int ret, i, pollfd, update_poll_flag = 1; + uint32_t revents, nb_fd; char tmp; - int update_poll_flag = 1; + struct lttng_poll_event events; DBG("Thread manage kernel started"); + ret = create_thread_poll_set(&events, 2); + if (ret < 0) { + goto error; + } + + ret = lttng_poll_add(&events, kernel_poll_pipe[0], LPOLLIN); + if (ret < 0) { + goto error; + } + while (1) { if (update_poll_flag == 1) { - nb_fd = update_kernel_pollfd(); - if (nb_fd < 0) { + ret = update_kernel_poll(&events); + if (ret < 0) { goto error; } update_poll_flag = 0; } - DBG("Polling on %d fds", nb_fd); + nb_fd = LTTNG_POLL_GETNB(&events); + + DBG("Thread kernel polling on %d fds", nb_fd); + + /* Zeroed the poll events */ + lttng_poll_reset(&events); /* Poll infinite value of time */ - ret = poll(kernel_pollfd, nb_fd, -1); + ret = lttng_poll_wait(&events, -1); if (ret < 0) { - perror("poll kernel thread"); goto error; } else if (ret == 0) { /* Should not happen since timeout is infinite */ + ERR("Return value of poll is 0 with an infinite timeout.\n" + "This should not have happened! Continuing..."); continue; } - /* Thread quit pipe has been closed. Killing thread. */ - if (kernel_pollfd[nb_fd - 1].revents == POLLNVAL) { - goto error; - } - - DBG("Kernel poll event triggered"); + for (i = 0; i < nb_fd; i++) { + /* Fetch once the poll data */ + revents = LTTNG_POLL_GETEV(&events, i); + pollfd = LTTNG_POLL_GETFD(&events, i); - /* - * Check if the wake up pipe was triggered. If so, the kernel_pollfd - * must be updated. - */ - switch (kernel_pollfd[nb_fd - 2].revents) { - case POLLIN: - ret = read(kernel_poll_pipe[0], &tmp, 1); - update_poll_flag = 1; - continue; - case POLLERR: - goto error; - default: - break; - } + /* Thread quit pipe has been closed. Killing thread. */ + ret = check_thread_quit_pipe(pollfd, revents); + if (ret) { + goto error; + } - for (i = 0; i < nb_fd; i++) { - switch (kernel_pollfd[i].revents) { - /* - * New CPU detected by the kernel. Adding kernel stream to kernel - * session and updating the kernel consumer - */ - case POLLIN | POLLRDNORM: - ret = update_kernel_stream(kernel_pollfd[i].fd); - if (ret < 0) { - continue; + /* Check for data on kernel pipe */ + if (pollfd == kernel_poll_pipe[0] && (revents & LPOLLIN)) { + ret = read(kernel_poll_pipe[0], &tmp, 1); + update_poll_flag = 1; + continue; + } else { + /* + * New CPU detected by the kernel. Adding kernel stream to + * kernel session and updating the kernel consumer + */ + if (revents & LPOLLIN) { + ret = update_kernel_stream(pollfd); + if (ret < 0) { + continue; + } + break; + /* + * TODO: We might want to handle the LPOLLERR | LPOLLHUP + * and unregister kernel stream at this point. + */ } - break; } } } error: DBG("Kernel thread dying"); - if (kernel_pollfd) { - free(kernel_pollfd); - } - close(kernel_poll_pipe[0]); close(kernel_poll_pipe[1]); + + lttng_poll_clean(&events); + return NULL; } @@ -640,9 +777,10 @@ error: */ static void *thread_manage_kconsumerd(void *data) { - int sock = 0, ret; + int sock = 0, i, ret, pollfd; + uint32_t revents, nb_fd; enum lttcomm_return_code code; - struct pollfd pollfd[2]; + struct lttng_poll_event events; DBG("[thread] Manage kconsumerd started"); @@ -651,26 +789,46 @@ static void *thread_manage_kconsumerd(void *data) goto error; } - /* First fd is always the quit pipe */ - pollfd[0].fd = thread_quit_pipe[0]; + /* + * Pass 2 as size here for the thread quit pipe and kconsumerd_err_sock. + * Nothing more will be added to this poll set. + */ + ret = create_thread_poll_set(&events, 2); + if (ret < 0) { + goto error; + } + + ret = lttng_poll_add(&events, kconsumerd_err_sock, LPOLLIN | LPOLLRDHUP); + if (ret < 0) { + goto error; + } - /* Apps socket */ - pollfd[1].fd = kconsumerd_err_sock; - pollfd[1].events = POLLIN; + nb_fd = LTTNG_POLL_GETNB(&events); /* Inifinite blocking call, waiting for transmission */ - ret = poll(pollfd, 2, -1); + ret = lttng_poll_wait(&events, -1); if (ret < 0) { - perror("poll kconsumerd thread"); goto error; } - /* Thread quit pipe has been closed. Killing thread. */ - if (pollfd[0].revents == POLLNVAL) { - goto error; - } else if (pollfd[1].revents == POLLERR) { - ERR("Kconsumerd err socket poll error"); - goto error; + for (i = 0; i < nb_fd; i++) { + /* Fetch once the poll data */ + revents = LTTNG_POLL_GETEV(&events, i); + pollfd = LTTNG_POLL_GETFD(&events, i); + + /* Thread quit pipe has been closed. Killing thread. */ + ret = check_thread_quit_pipe(pollfd, revents); + if (ret) { + goto error; + } + + /* Event on the registration socket */ + if (pollfd == kconsumerd_err_sock) { + if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + ERR("Kconsumerd err socket poll error"); + goto error; + } + } } sock = lttcomm_accept_unix_sock(kconsumerd_err_sock); @@ -679,13 +837,15 @@ static void *thread_manage_kconsumerd(void *data) } /* Getting status code from kconsumerd */ - ret = lttcomm_recv_unix_sock(sock, &code, sizeof(enum lttcomm_return_code)); + ret = lttcomm_recv_unix_sock(sock, &code, + sizeof(enum lttcomm_return_code)); if (ret <= 0) { goto error; } if (code == KCONSUMERD_COMMAND_SOCK_READY) { - kconsumerd_cmd_sock = lttcomm_connect_unix_sock(kconsumerd_cmd_unix_sock_path); + kconsumerd_cmd_sock = + lttcomm_connect_unix_sock(kconsumerd_cmd_unix_sock_path); if (kconsumerd_cmd_sock < 0) { sem_post(&kconsumerd_sem); perror("kconsumerd connect"); @@ -700,8 +860,49 @@ static void *thread_manage_kconsumerd(void *data) goto error; } + /* Remove the kconsumerd error sock since we've established a connexion */ + ret = lttng_poll_del(&events, kconsumerd_err_sock); + if (ret < 0) { + goto error; + } + + ret = lttng_poll_add(&events, sock, LPOLLIN | LPOLLRDHUP); + if (ret < 0) { + goto error; + } + + /* Update number of fd */ + nb_fd = LTTNG_POLL_GETNB(&events); + + /* Inifinite blocking call, waiting for transmission */ + ret = lttng_poll_wait(&events, -1); + if (ret < 0) { + goto error; + } + + for (i = 0; i < nb_fd; i++) { + /* Fetch once the poll data */ + revents = LTTNG_POLL_GETEV(&events, i); + pollfd = LTTNG_POLL_GETFD(&events, i); + + /* Thread quit pipe has been closed. Killing thread. */ + ret = check_thread_quit_pipe(pollfd, revents); + if (ret) { + goto error; + } + + /* Event on the kconsumerd socket */ + if (pollfd == sock) { + if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + ERR("Kconsumerd err socket second poll error"); + goto error; + } + } + } + /* Wait for any kconsumerd error */ - ret = lttcomm_recv_unix_sock(sock, &code, sizeof(enum lttcomm_return_code)); + ret = lttcomm_recv_unix_sock(sock, &code, + sizeof(enum lttcomm_return_code)); if (ret <= 0) { ERR("Kconsumerd closed the command socket"); goto error; @@ -711,117 +912,341 @@ static void *thread_manage_kconsumerd(void *data) error: DBG("Kconsumerd thread dying"); - if (kconsumerd_err_sock) { - close(kconsumerd_err_sock); - } - if (kconsumerd_cmd_sock) { - close(kconsumerd_cmd_sock); - } - if (sock) { - close(sock); - } + close(kconsumerd_err_sock); + close(kconsumerd_cmd_sock); + close(sock); unlink(kconsumerd_err_unix_sock_path); unlink(kconsumerd_cmd_unix_sock_path); - kconsumerd_pid = 0; + + lttng_poll_clean(&events); + return NULL; } /* - * This thread manage the application socket communication + * This thread manage application communication. */ static void *thread_manage_apps(void *data) { - int sock = 0, ret; - struct pollfd pollfd[2]; + int i, ret, pollfd; + uint32_t revents, nb_fd; + struct ust_command ust_cmd; + struct lttng_poll_event events; + + DBG("[thread] Manage application started"); + + ret = create_thread_poll_set(&events, 2); + if (ret < 0) { + goto error; + } + + ret = lttng_poll_add(&events, apps_cmd_pipe[0], LPOLLIN | LPOLLRDHUP); + if (ret < 0) { + goto error; + } + + while (1) { + /* Zeroed the events structure */ + lttng_poll_reset(&events); + + nb_fd = LTTNG_POLL_GETNB(&events); + + DBG("Apps thread polling on %d fds", nb_fd); + + /* Inifinite blocking call, waiting for transmission */ + ret = lttng_poll_wait(&events, -1); + if (ret < 0) { + goto error; + } + + for (i = 0; i < nb_fd; i++) { + /* Fetch once the poll data */ + revents = LTTNG_POLL_GETEV(&events, i); + pollfd = LTTNG_POLL_GETFD(&events, i); + + /* Thread quit pipe has been closed. Killing thread. */ + ret = check_thread_quit_pipe(pollfd, revents); + if (ret) { + goto error; + } + + /* Inspect the apps cmd pipe */ + if (pollfd == apps_cmd_pipe[0]) { + if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + ERR("Apps command pipe error"); + goto error; + } else if (revents & LPOLLIN) { + /* Empty pipe */ + ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd)); + if (ret < 0 || ret < sizeof(ust_cmd)) { + perror("read apps cmd pipe"); + goto error; + } + + /* Register applicaton to the session daemon */ + ret = ust_app_register(&ust_cmd.reg_msg, + ust_cmd.sock); + if (ret < 0) { + /* Only critical ENOMEM error can be returned here */ + goto error; + } + + ret = ustctl_register_done(ust_cmd.sock); + if (ret < 0) { + /* + * If the registration is not possible, we simply + * unregister the apps and continue + */ + ust_app_unregister(ust_cmd.sock); + } else { + /* + * We just need here to monitor the close of the UST + * socket and poll set monitor those by default. + */ + ret = lttng_poll_add(&events, ust_cmd.sock, 0); + if (ret < 0) { + goto error; + } + + DBG("Apps with sock %d added to poll set", + ust_cmd.sock); + } + break; + } + } else { + /* + * At this point, we know that a registered application made + * the event at poll_wait. + */ + if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + /* Removing from the poll set */ + ret = lttng_poll_del(&events, pollfd); + if (ret < 0) { + goto error; + } + + /* Socket closed */ + ust_app_unregister(pollfd); + break; + } + } + } + } + +error: + DBG("Application communication apps dying"); + close(apps_cmd_pipe[0]); + close(apps_cmd_pipe[1]); + + lttng_poll_clean(&events); + + return NULL; +} + +/* + * Dispatch request from the registration threads to the application + * communication thread. + */ +static void *thread_dispatch_ust_registration(void *data) +{ + int ret; + struct cds_wfq_node *node; + struct ust_command *ust_cmd = NULL; + + DBG("[thread] Dispatch UST command started"); + + while (!dispatch_thread_exit) { + /* Atomically prepare the queue futex */ + futex_nto1_prepare(&ust_cmd_queue.futex); + + do { + /* Dequeue command for registration */ + node = cds_wfq_dequeue_blocking(&ust_cmd_queue.queue); + if (node == NULL) { + DBG("Waked up but nothing in the UST command queue"); + /* Continue thread execution */ + break; + } + + ust_cmd = caa_container_of(node, struct ust_command, node); + + DBG("Dispatching UST registration pid:%d ppid:%d uid:%d" + " gid:%d sock:%d name:%s (version %d.%d)", + ust_cmd->reg_msg.pid, ust_cmd->reg_msg.ppid, + ust_cmd->reg_msg.uid, ust_cmd->reg_msg.gid, + ust_cmd->sock, ust_cmd->reg_msg.name, + ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor); + /* + * Inform apps thread of the new application registration. This + * call is blocking so we can be assured that the data will be read + * at some point in time or wait to the end of the world :) + */ + ret = write(apps_cmd_pipe[1], ust_cmd, + sizeof(struct ust_command)); + if (ret < 0) { + perror("write apps cmd pipe"); + if (errno == EBADF) { + /* + * We can't inform the application thread to process + * registration. We will exit or else application + * registration will not occur and tracing will never + * start. + */ + goto error; + } + } + free(ust_cmd); + } while (node != NULL); + + /* Futex wait on queue. Blocking call on futex() */ + futex_nto1_wait(&ust_cmd_queue.futex); + } + +error: + DBG("Dispatch thread dying"); + return NULL; +} - /* TODO: Something more elegant is needed but fine for now */ - /* FIXME: change all types to either uint8_t, uint32_t, uint64_t - * for 32-bit vs 64-bit compat processes. */ - /* replicate in ust with version number */ - struct { - int reg; /* 1:register, 0:unregister */ - pid_t pid; - uid_t uid; - } reg_msg; +/* + * This thread manage application registration. + */ +static void *thread_registration_apps(void *data) +{ + int sock = 0, i, ret, pollfd; + uint32_t revents, nb_fd; + struct lttng_poll_event events; + /* + * Get allocated in this thread, enqueued to a global queue, dequeued and + * freed in the manage apps thread. + */ + struct ust_command *ust_cmd = NULL; - DBG("[thread] Manage apps started"); + DBG("[thread] Manage application registration started"); ret = lttcomm_listen_unix_sock(apps_sock); if (ret < 0) { goto error; } - /* First fd is always the quit pipe */ - pollfd[0].fd = thread_quit_pipe[0]; + /* + * Pass 2 as size here for the thread quit pipe and apps socket. Nothing + * more will be added to this poll set. + */ + ret = create_thread_poll_set(&events, 2); + if (ret < 0) { + goto error; + } - /* Apps socket */ - pollfd[1].fd = apps_sock; - pollfd[1].events = POLLIN; + /* Add the application registration socket */ + ret = lttng_poll_add(&events, apps_sock, LPOLLIN | LPOLLRDHUP); + if (ret < 0) { + goto error; + } /* Notify all applications to register */ - notify_apps(default_global_apps_pipe); + ret = notify_ust_apps(1); + if (ret < 0) { + ERR("Failed to notify applications or create the wait shared memory.\n" + "Execution continues but there might be problem for already\n" + "running applications that wishes to register."); + } while (1) { DBG("Accepting application registration"); + nb_fd = LTTNG_POLL_GETNB(&events); + /* Inifinite blocking call, waiting for transmission */ - ret = poll(pollfd, 2, -1); + ret = lttng_poll_wait(&events, -1); if (ret < 0) { - perror("poll apps thread"); goto error; } - /* Thread quit pipe has been closed. Killing thread. */ - if (pollfd[0].revents == POLLNVAL) { - goto error; - } else if (pollfd[1].revents == POLLERR) { - ERR("Apps socket poll error"); - goto error; - } + for (i = 0; i < nb_fd; i++) { + /* Fetch once the poll data */ + revents = LTTNG_POLL_GETEV(&events, i); + pollfd = LTTNG_POLL_GETFD(&events, i); - sock = lttcomm_accept_unix_sock(apps_sock); - if (sock < 0) { - goto error; - } + /* Thread quit pipe has been closed. Killing thread. */ + ret = check_thread_quit_pipe(pollfd, revents); + if (ret) { + goto error; + } - /* - * Basic recv here to handle the very simple data - * that the libust send to register (reg_msg). - */ - ret = recv(sock, ®_msg, sizeof(reg_msg), 0); - if (ret < 0) { - perror("recv"); - continue; - } + /* Event on the registration socket */ + if (pollfd == apps_sock) { + if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + ERR("Register apps socket poll error"); + goto error; + } else if (revents & LPOLLIN) { + sock = lttcomm_accept_unix_sock(apps_sock); + if (sock < 0) { + goto error; + } - /* Add application to the global traceable list */ - if (reg_msg.reg == 1) { - /* Registering */ - ret = register_traceable_app(reg_msg.pid, reg_msg.uid); - if (ret < 0) { - /* register_traceable_app only return an error with - * ENOMEM. At this point, we better stop everything. - */ - goto error; + /* Create UST registration command for enqueuing */ + ust_cmd = malloc(sizeof(struct ust_command)); + if (ust_cmd == NULL) { + perror("ust command malloc"); + goto error; + } + + /* + * Using message-based transmissions to ensure we don't + * have to deal with partially received messages. + */ + ret = lttcomm_recv_unix_sock(sock, &ust_cmd->reg_msg, + sizeof(struct ust_register_msg)); + if (ret < 0 || ret < sizeof(struct ust_register_msg)) { + if (ret < 0) { + perror("lttcomm_recv_unix_sock register apps"); + } else { + ERR("Wrong size received on apps register"); + } + free(ust_cmd); + close(sock); + continue; + } + + ust_cmd->sock = sock; + + DBG("UST registration received with pid:%d ppid:%d uid:%d" + " gid:%d sock:%d name:%s (version %d.%d)", + ust_cmd->reg_msg.pid, ust_cmd->reg_msg.ppid, + ust_cmd->reg_msg.uid, ust_cmd->reg_msg.gid, + ust_cmd->sock, ust_cmd->reg_msg.name, + ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor); + + /* + * Lock free enqueue the registration request. The red pill + * has been taken! This apps will be part of the *system*. + */ + cds_wfq_enqueue(&ust_cmd_queue.queue, &ust_cmd->node); + + /* + * Wake the registration queue futex. Implicit memory + * barrier with the exchange in cds_wfq_enqueue. + */ + futex_nto1_wake(&ust_cmd_queue.futex); + } } - } else { - /* Unregistering */ - unregister_traceable_app(reg_msg.pid); } } error: - DBG("Apps thread dying"); - if (apps_sock) { - close(apps_sock); - } - if (sock) { - close(sock); - } + DBG("UST Registration thread dying"); + + /* Notify that the registration thread is gone */ + notify_ust_apps(0); + close(apps_sock); + close(sock); unlink(apps_unix_sock_path); + + lttng_poll_clean(&events); + return NULL; } @@ -836,7 +1261,8 @@ static int spawn_kconsumerd_thread(void) /* Setup semaphore */ sem_init(&kconsumerd_sem, 0, 0); - ret = pthread_create(&kconsumerd_thread, NULL, thread_manage_kconsumerd, (void *) NULL); + ret = pthread_create(&kconsumerd_thread, NULL, + thread_manage_kconsumerd, (void *) NULL); if (ret != 0) { perror("pthread_create kconsumerd"); goto error; @@ -857,6 +1283,26 @@ error: return ret; } +/* + * Join kernel consumer thread + */ +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; + } +} + /* * Fork and exec a kernel consumer daemon (kconsumerd). * @@ -875,12 +1321,13 @@ static pid_t spawn_kconsumerd(void) /* * Exec kconsumerd. */ - if (opt_verbose > 1) { + if (opt_verbose > 1 || opt_verbose_kconsumerd) { verbosity = "--verbose"; } else { verbosity = "--quiet"; } - execl(INSTALL_BIN_PATH "/ltt-kconsumerd", "ltt-kconsumerd", verbosity, NULL); + execl(INSTALL_BIN_PATH "/ltt-kconsumerd", + "ltt-kconsumerd", verbosity, NULL); if (errno != 0) { perror("kernel start consumer exec"); } @@ -944,22 +1391,31 @@ error: */ 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 < 0) { - ERR("Unable to load module %s", kernel_modules_list[i]); + 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); } - DBG("Modprobe successfully %s", kernel_modules_list[i]); - i++; } error: @@ -974,14 +1430,15 @@ 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) { + PERROR("Cannot create debugfs path"); goto error; } ret = mount(type, path, type, 0, NULL); if (ret < 0) { - perror("mount debugfs"); + PERROR("Cannot mount debugfs"); goto error; } @@ -999,7 +1456,7 @@ static void init_kernel_tracer(void) int ret; char *proc_mounts = "/proc/mounts"; char line[256]; - char *debugfs_path = NULL, *lttng_path; + char *debugfs_path = NULL, *lttng_path = NULL; FILE *fp; /* Detect debugfs */ @@ -1031,6 +1488,7 @@ static void init_kernel_tracer(void) } ret = mount_debugfs(debugfs_path); if (ret < 0) { + perror("Cannot mount debugfs"); goto error; } } @@ -1073,17 +1531,24 @@ error: } /* - * Start tracing by creating trace directory and sending FDs to the kernel - * consumer. + * Init tracing by creating trace directory and sending fds kernel consumer. */ -static int start_kernel_trace(struct ltt_kernel_session *session) +static int init_kernel_tracing(struct ltt_kernel_session *session) { int ret = 0; if (session->kconsumer_fds_sent == 0) { - ret = send_kconsumerd_fds(kconsumerd_cmd_sock, session); + /* + * Assign default kernel consumer socket if no consumer assigned to the + * kernel session. At this point, it's NOT suppose to be 0 but this is + * an extra security check. + */ + if (session->consumer_fd == 0) { + session->consumer_fd = kconsumerd_cmd_sock; + } + + ret = send_kconsumerd_fds(session); if (ret < 0) { - ERR("Send kconsumerd fds failed"); ret = LTTCOMM_KERN_CONSUMER_FAIL; goto error; } @@ -1096,48 +1561,60 @@ error: } /* - * Notify kernel thread to update it's pollfd. + * Create an UST session and add it to the session ust list. */ -static int notify_kernel_pollfd(void) +static int create_ust_session(struct ltt_session *session, + struct lttng_domain *domain) { int ret; - - /* Inform kernel thread of the new kernel channel */ - ret = write(kernel_poll_pipe[1], "!", 1); - if (ret < 0) { - perror("write kernel poll pipe"); + struct ltt_ust_session *lus; + struct ust_app *app; + + switch (domain->type) { + case LTTNG_DOMAIN_UST_PID: + app = ust_app_get_by_pid(domain->attr.pid); + if (app == NULL) { + ret = LTTCOMM_APP_NOT_FOUND; + goto error; + } + break; + default: + goto error; } - return ret; -} - -/* - * Allocate a channel structure and fill it. - */ -static struct lttng_channel *init_default_channel(char *name) -{ - struct lttng_channel *chan; + DBG("Creating UST session"); - chan = malloc(sizeof(struct lttng_channel)); - if (chan == NULL) { - perror("init channel malloc"); + lus = trace_ust_create_session(session->path, domain->attr.pid, domain); + if (lus == NULL) { + ret = LTTCOMM_UST_SESS_FAIL; goto error; } - if (snprintf(chan->name, NAME_MAX, "%s", name) < 0) { - perror("snprintf channel name"); - return NULL; + ret = mkdir_recursive(lus->path, S_IRWXU | S_IRWXG, + geteuid(), allowed_group()); + if (ret < 0) { + if (ret != -EEXIST) { + ERR("Trace directory creation error"); + ret = LTTCOMM_UST_SESS_FAIL; + goto error; + } + } + + /* Create session on the UST tracer */ + ret = ustctl_create_session(app->sock, lus); + if (ret < 0) { + ret = LTTCOMM_UST_SESS_FAIL; + goto error; } - chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE; - chan->attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE; - chan->attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM; - chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER; - chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER; - chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT; + cds_list_add(&lus->list, &session->ust_session_list.head); + session->ust_session_list.count++; + + return LTTCOMM_OK; error: - return chan; + free(lus); + return ret; } /* @@ -1155,9 +1632,15 @@ static int create_kernel_session(struct ltt_session *session) goto error; } - ret = mkdir_recursive(session->path, S_IRWXU | S_IRWXG ); + /* Set kernel consumer socket fd */ + if (kconsumerd_cmd_sock) { + session->kernel_session->consumer_fd = kconsumerd_cmd_sock; + } + + 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; } @@ -1172,7 +1655,7 @@ error: * client for session listing. * * The session list lock MUST be acquired before calling this function. Use - * lock_session_list() and unlock_session_list(). + * session_lock_list() and session_unlock_list(). */ static void list_lttng_sessions(struct lttng_session *sessions) { @@ -1186,7 +1669,9 @@ 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++; } } @@ -1204,7 +1689,8 @@ static void list_lttng_channels(struct ltt_session *session, /* Kernel channels */ if (session->kernel_session != NULL) { - cds_list_for_each_entry(kchan, &session->kernel_session->channel_list.head, list) { + 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; @@ -1232,6 +1718,7 @@ static void list_lttng_events(struct ltt_kernel_channel *kchan, /* 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: @@ -1248,781 +1735,1088 @@ static void list_lttng_events(struct ltt_kernel_channel *kchan, memcpy(&events[i].attr.ftrace, &event->event->u.ftrace, sizeof(struct lttng_kernel_function)); break; + case LTTNG_KERNEL_NOOP: + events[i].type = LTTNG_EVENT_NOOP; + break; + case LTTNG_KERNEL_SYSCALL: + events[i].type = LTTNG_EVENT_SYSCALL; + break; + case LTTNG_KERNEL_ALL: + assert(0); + 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. + * Command LTTNG_DISABLE_CHANNEL processed by the client thread. */ -static int process_client_msg(struct command_ctx *cmd_ctx) +static int cmd_disable_channel(struct ltt_session *session, + int domain, char *channel_name) { - int ret = LTTCOMM_OK; - - DBG("Processing client command %d", cmd_ctx->lsm->cmd_type); + int ret; - /* Listing commands don't need a session */ - switch (cmd_ctx->lsm->cmd_type) { - case LTTNG_CREATE_SESSION: - case LTTNG_LIST_SESSIONS: - case LTTNG_LIST_TRACEPOINTS: - 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); - if (cmd_ctx->session == NULL) { - /* If session name not found */ - if (cmd_ctx->lsm->session_name != NULL) { - ret = LTTCOMM_SESS_NOT_FOUND; - } else { /* If no session name specified */ - ret = LTTCOMM_SELECT_SESS; + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + ret = channel_kernel_disable(session->kernel_session, + channel_name); + if (ret != LTTCOMM_OK) { + goto error; } + + kernel_wait_quiescent(kernel_tracer_fd); + break; + case LTTNG_DOMAIN_UST_PID: + break; + default: + ret = LTTCOMM_UNKNOWN_DOMAIN; goto error; - } else { - /* Acquire lock for the session */ - lock_session(cmd_ctx->session); - } - break; } - /* - * Check kernel command for kernel session. - */ - switch (cmd_ctx->lsm->cmd_type) { - case LTTNG_ADD_CONTEXT: - 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_LIST_TRACEPOINTS: - /* Kernel tracer check */ - if (kernel_tracer_fd == 0) { - init_kernel_tracer(); - if (kernel_tracer_fd == 0) { - ret = LTTCOMM_KERN_NA; - goto error; - } - } + ret = LTTCOMM_OK; - /* Need a session for kernel command */ - if (cmd_ctx->lsm->cmd_type != LTTNG_LIST_TRACEPOINTS && - cmd_ctx->session->kernel_session == NULL) { +error: + return ret; +} - ret = create_kernel_session(cmd_ctx->session); - if (ret < 0) { - ret = LTTCOMM_KERN_SESS_FAIL; - goto error; - } +/* + * Copy channel from attributes and set it in the application channel list. + */ +static int copy_ust_channel_to_app(struct ltt_ust_session *usess, + struct lttng_channel *attr, struct ust_app *app) +{ + int ret; + struct ltt_ust_channel *uchan, *new_chan; - /* Start the kernel consumer daemon */ - if (kconsumerd_pid == 0) { - ret = start_kconsumerd(); - if (ret < 0) { - goto error; - } - } - } + uchan = trace_ust_get_channel_by_name(attr->name, usess); + if (uchan == NULL) { + ret = LTTCOMM_FATAL; + 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; - } + new_chan = trace_ust_create_channel(attr, usess->path); + if (new_chan == NULL) { + PERROR("malloc ltt_ust_channel"); + ret = LTTCOMM_FATAL; + goto error; } -#endif /* DISABLED */ - /* Process by command type */ - switch (cmd_ctx->lsm->cmd_type) { - case LTTNG_ADD_CONTEXT: - { - struct lttng_kernel_context kctx; + ret = channel_ust_copy(new_chan, uchan); + if (ret < 0) { + ret = LTTCOMM_FATAL; + goto error; + } - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } + /* Add channel to the ust app channel list */ + cds_list_add(&new_chan->list, &app->channels.head); + app->channels.count++; - 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); - - /* 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; - } - break; - default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; - } +error: + return ret; +} - ret = LTTCOMM_OK; - break; - } - case LTTNG_KERNEL_DISABLE_CHANNEL: +/* + * Command LTTNG_ENABLE_CHANNEL processed by the client thread. + */ +static int cmd_enable_channel(struct ltt_session *session, + struct lttng_domain *domain, struct lttng_channel *attr) +{ + int ret; + + switch (domain->type) { + case LTTNG_DOMAIN_KERNEL: { - struct ltt_kernel_channel *chan; + struct ltt_kernel_channel *kchan; - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + kchan = trace_kernel_get_channel_by_name(attr->name, + session->kernel_session); + if (kchan == NULL) { + ret = channel_kernel_create(session->kernel_session, + attr, kernel_poll_pipe[1]); + } else { + ret = channel_kernel_enable(session->kernel_session, kchan); } - 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; + if (ret != LTTCOMM_OK) { goto error; - } else if (chan->enabled == 1) { - ret = kernel_disable_channel(chan); - if (ret < 0) { - if (ret != EEXIST) { - ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL; - } - goto error; - } } kernel_wait_quiescent(kernel_tracer_fd); - ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_DISABLE_EVENT: + case LTTNG_DOMAIN_UST_PID: { - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; + int sock; + struct ltt_ust_channel *uchan; + struct ltt_ust_session *usess; + struct ust_app *app; + + usess = trace_ust_get_session_by_pid(&session->ust_session_list, + domain->attr.pid); + if (usess == NULL) { + ret = LTTCOMM_UST_CHAN_NOT_FOUND; + goto error; + } - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + app = ust_app_get_by_pid(domain->attr.pid); + if (app == NULL) { + ret = LTTCOMM_APP_NOT_FOUND; + goto error; + } + sock = app->sock; + + uchan = trace_ust_get_channel_by_name(attr->name, usess); + if (uchan == NULL) { + ret = channel_ust_create(usess, attr, sock); + } else { + ret = channel_ust_enable(usess, uchan, sock); } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { + if (ret != LTTCOMM_OK) { + goto error; + } + + ret = copy_ust_channel_to_app(usess, attr, app); + if (ret != LTTCOMM_OK) { + goto error; + } + + DBG("UST channel %s created for app sock %d with pid %d", + attr->name, app->sock, domain->attr.pid); + break; + } + default: + ret = LTTCOMM_UNKNOWN_DOMAIN; + goto error; + } + + ret = LTTCOMM_OK; + +error: + return ret; +} + +/* + * Command LTTNG_DISABLE_EVENT processed by the client thread. + */ +static int cmd_disable_event(struct ltt_session *session, int domain, + char *channel_name, char *event_name) +{ + int ret; + struct ltt_kernel_channel *kchan; + + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + kchan = trace_kernel_get_channel_by_name(channel_name, + session->kernel_session); + if (kchan == 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; - goto error; - } + ret = event_kernel_disable_tracepoint(session->kernel_session, kchan, event_name); + if (ret != LTTCOMM_OK) { + goto error; } kernel_wait_quiescent(kernel_tracer_fd); - ret = LTTCOMM_OK; break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - case LTTNG_KERNEL_DISABLE_ALL_EVENT: - { - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } + ret = LTTCOMM_OK; - DBG("Disabling all enabled kernel events"); +error: + return ret; +} - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { +/* + * Command LTTNG_DISABLE_ALL_EVENT processed by the client thread. + */ +static int cmd_disable_event_all(struct ltt_session *session, int domain, + char *channel_name) +{ + int ret; + struct ltt_kernel_channel *kchan; + + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + kchan = trace_kernel_get_channel_by_name(channel_name, + 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(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; - } + ret = event_kernel_disable_all(session->kernel_session, kchan); + if (ret != LTTCOMM_OK) { + goto error; } - /* Quiescent wait after event disable */ kernel_wait_quiescent(kernel_tracer_fd); - ret = LTTCOMM_OK; break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - case LTTNG_KERNEL_ENABLE_CHANNEL: - { - struct ltt_kernel_channel *chan; - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + ret = LTTCOMM_OK; + +error: + return ret; +} + +/* + * Command LTTNG_ADD_CONTEXT processed by the client thread. + */ +static int cmd_add_context(struct ltt_session *session, int domain, + char *channel_name, char *event_name, struct lttng_event_context *ctx) +{ + int ret; + + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + /* Add kernel context to kernel tracer */ + ret = context_kernel_add(session->kernel_session, ctx, + event_name, channel_name); + if (ret != LTTCOMM_OK) { + goto error; } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - /* Channel not found, creating it */ - DBG("Creating kernel channel"); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; + } - 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 = LTTCOMM_OK; - /* 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) { - if (ret != EEXIST) { - ret = LTTCOMM_KERN_CHAN_ENABLE_FAIL; - } +error: + return ret; +} + +/* + * Command LTTNG_ENABLE_EVENT processed by the client thread. + */ +static int cmd_enable_event(struct ltt_session *session, int domain, + char *channel_name, struct lttng_event *event) +{ + int ret; + struct ltt_kernel_channel *kchan; + + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + kchan = trace_kernel_get_channel_by_name(channel_name, + session->kernel_session); + if (kchan == NULL) { + /* This call will notify the kernel thread */ + ret = channel_kernel_create(session->kernel_session, + NULL, kernel_poll_pipe[1]); + if (ret != LTTCOMM_OK) { goto error; } } + /* Get the newly created kernel channel pointer */ + kchan = trace_kernel_get_channel_by_name(channel_name, + session->kernel_session); + if (kchan == NULL) { + /* This sould not happen... */ + ret = LTTCOMM_FATAL; + goto error; + } + + ret = event_kernel_enable_tracepoint(session->kernel_session, kchan, event); + if (ret != LTTCOMM_OK) { + goto error; + } + kernel_wait_quiescent(kernel_tracer_fd); - ret = LTTCOMM_OK; break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - case LTTNG_KERNEL_ENABLE_EVENT: - { - 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); - if (ret < 0) { - goto setup_error; - } - channel_name = cmd_ctx->lsm->u.enable.channel_name; + ret = LTTCOMM_OK; - 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; - } +error: + return ret; +} - 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); +/* + * Command LTTNG_ENABLE_ALL_EVENT processed by the client thread. + */ +static int cmd_enable_event_all(struct ltt_session *session, int domain, + char *channel_name, int event_type) +{ + int ret; + struct ltt_kernel_channel *kchan; - 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, 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, channel_name); - ret = kernel_enable_event(ev); - if (ret == -EEXIST) { - ret = LTTCOMM_KERN_EVENT_EXIST; + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + kchan = trace_kernel_get_channel_by_name(channel_name, + session->kernel_session); + if (kchan == NULL) { + /* This call will notify the kernel thread */ + ret = channel_kernel_create(session->kernel_session, NULL, + kernel_poll_pipe[1]); + if (ret != LTTCOMM_OK) { goto error; } } - if (ret < 0) { + /* Get the newly created kernel channel pointer */ + kchan = trace_kernel_get_channel_by_name(channel_name, + session->kernel_session); + if (kchan == NULL) { + /* This sould not happen... */ + ret = LTTCOMM_FATAL; + goto error; + } + + switch (event_type) { + case LTTNG_KERNEL_SYSCALL: + ret = event_kernel_enable_all_syscalls(session->kernel_session, + kchan, kernel_tracer_fd); + break; + case LTTNG_KERNEL_TRACEPOINT: + /* + * This call enables all LTTNG_KERNEL_TRACEPOINTS and + * events already registered to the channel. + */ + ret = event_kernel_enable_all_tracepoints(session->kernel_session, + kchan, kernel_tracer_fd); + break; + case LTTNG_KERNEL_ALL: + /* Enable syscalls and tracepoints */ + ret = event_kernel_enable_all(session->kernel_session, + kchan, kernel_tracer_fd); + break; + default: ret = LTTCOMM_KERN_ENABLE_FAIL; goto error; } + if (ret != LTTCOMM_OK) { + goto error; + } kernel_wait_quiescent(kernel_tracer_fd); - ret = LTTCOMM_OK; break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - case LTTNG_KERNEL_ENABLE_ALL_EVENT: - { - int size, i; - char *channel_name; - struct ltt_kernel_channel *kchan; - struct ltt_kernel_event *ev; - struct lttng_event *event_list; - struct lttng_channel *chan; - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + ret = LTTCOMM_OK; + +error: + return ret; +} + +/* + * Command LTTNG_LIST_TRACEPOINTS processed by the client thread. + */ +static ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events) +{ + int ret; + ssize_t nb_events = 0; + + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + 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; + goto error; + } - DBG("Enabling all kernel event"); + return nb_events; - channel_name = cmd_ctx->lsm->u.enable.channel_name; +error: + /* Return negative value to differentiate return code */ + return -ret; +} - 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; - } +/* + * Command LTTNG_START_TRACE processed by the client thread. + */ +static int cmd_start_trace(struct ltt_session *session) +{ + int ret; + struct ltt_kernel_channel *kchan; + struct ltt_kernel_session *ksession; - 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); + /* Short cut */ + ksession = session->kernel_session; - /* For each event in the kernel session */ - cds_list_for_each_entry(ev, &kchan->events_list.head, list) { - DBG("Enabling kernel event %s for channel %s.", - ev->event->name, channel_name); - ret = kernel_enable_event(ev); + /* Kernel tracing */ + if (ksession != NULL) { + /* Open kernel metadata */ + if (ksession->metadata == NULL) { + ret = kernel_open_metadata(ksession, ksession->trace_path); if (ret < 0) { - continue; + ret = LTTCOMM_KERN_META_FAIL; + goto error; } } - size = kernel_list_events(kernel_tracer_fd, &event_list); - if (size < 0) { - ret = LTTCOMM_KERN_LIST_FAIL; - goto error; + /* Open kernel metadata stream */ + if (ksession->metadata_stream_fd == 0) { + ret = kernel_open_metadata_stream(ksession); + if (ret < 0) { + ERR("Kernel create metadata stream failed"); + ret = LTTCOMM_KERN_STREAM_FAIL; + goto error; + } } - for (i = 0; i < size; i++) { - ev = get_kernel_event_by_name(event_list[i].name, kchan); - if (ev == 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); + /* For each channel */ + cds_list_for_each_entry(kchan, &ksession->channel_list.head, list) { + if (kchan->stream_count == 0) { + ret = kernel_open_channel_stream(kchan); if (ret < 0) { - /* Ignore error here and continue */ + ret = LTTCOMM_KERN_STREAM_FAIL; + goto error; } + /* Update the stream global counter */ + ksession->stream_count_global += ret; } } - free(event_list); + /* Setup kernel consumer socket and send fds to it */ + ret = init_kernel_tracing(ksession); + if (ret < 0) { + ret = LTTCOMM_KERN_START_FAIL; + goto error; + } + + /* This start the kernel tracing */ + ret = kernel_start_session(ksession); + if (ret < 0) { + ret = LTTCOMM_KERN_START_FAIL; + goto error; + } - /* Quiescent wait after event enable */ + /* Quiescent wait after starting trace */ kernel_wait_quiescent(kernel_tracer_fd); - ret = LTTCOMM_OK; - break; } - case LTTNG_LIST_TRACEPOINTS: - { - 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; + /* TODO: Start all UST traces */ + + ret = LTTCOMM_OK; + +error: + return ret; +} + +/* + * Command LTTNG_STOP_TRACE processed by the client thread. + */ +static int cmd_stop_trace(struct ltt_session *session) +{ + int ret; + struct ltt_kernel_channel *kchan; + struct ltt_kernel_session *ksession; + + /* Short cut */ + ksession = session->kernel_session; + + /* Kernel tracer */ + if (ksession != NULL) { + DBG("Stop kernel tracing"); + + /* Flush all buffers before stopping */ + ret = kernel_metadata_flush_buffer(ksession->metadata_stream_fd); + if (ret < 0) { + ERR("Kernel metadata flush failed"); + } + + cds_list_for_each_entry(kchan, &ksession->channel_list.head, list) { + ret = kernel_flush_buffer(kchan); + if (ret < 0) { + ERR("Kernel flush buffer 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, sizeof(struct lttng_event) * nb_events); + ret = kernel_stop_session(ksession); if (ret < 0) { - free(events); - goto setup_error; + ret = LTTCOMM_KERN_STOP_FAIL; + goto error; } - /* Copy event list into message payload */ - memcpy(cmd_ctx->llm->payload, events, - sizeof(struct lttng_event) * nb_events); + kernel_wait_quiescent(kernel_tracer_fd); + } - free(events); + /* TODO : User-space tracer */ - ret = LTTCOMM_OK; - break; + ret = LTTCOMM_OK; + +error: + return ret; +} + +/* + * Command LTTNG_CREATE_SESSION processed by the client thread. + */ +static int cmd_create_session(char *name, char *path) +{ + int ret; + + ret = session_create(name, path); + if (ret != LTTCOMM_OK) { + goto error; } - case LTTNG_START_TRACE: + + ret = LTTCOMM_OK; + +error: + return ret; +} + +/* + * Command LTTNG_DESTROY_SESSION processed by the client thread. + */ +static int cmd_destroy_session(struct ltt_session *session, char *name) +{ + int ret; + + /* Clean kernel session teardown */ + teardown_kernel_session(session); + + /* + * Must notify the kernel thread here to update it's poll setin order + * to remove the channel(s)' fd just destroyed. + */ + ret = notify_thread_pipe(kernel_poll_pipe[1]); + if (ret < 0) { + perror("write kernel poll pipe"); + } + + ret = session_destroy(name); + + return ret; +} + +/* + * Command LTTNG_CALIBRATE processed by the client thread. + */ +static int cmd_calibrate(int domain, struct lttng_calibrate *calibrate) +{ + int ret; + + switch (domain) { + case LTTNG_DOMAIN_KERNEL: { - struct ltt_kernel_channel *chan; + struct lttng_kernel_calibrate kcalibrate; - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); + kcalibrate.type = calibrate->type; + ret = kernel_calibrate(kernel_tracer_fd, &kcalibrate); if (ret < 0) { - goto setup_error; + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; } + break; + } + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; + } - /* Kernel tracing */ - if (cmd_ctx->session->kernel_session != NULL) { - 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); - if (ret < 0) { - ret = LTTCOMM_KERN_META_FAIL; - goto error; - } - } + ret = LTTCOMM_OK; - if (cmd_ctx->session->kernel_session->metadata_stream_fd == 0) { - DBG("Opening kernel metadata stream"); - if (cmd_ctx->session->kernel_session->metadata_stream_fd == 0) { - ret = kernel_open_metadata_stream(cmd_ctx->session->kernel_session); - if (ret < 0) { - ERR("Kernel create metadata stream failed"); - ret = LTTCOMM_KERN_STREAM_FAIL; - goto error; - } - } - } +error: + return ret; +} - /* For each channel */ - 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) { - ERR("Kernel create channel stream failed"); - ret = LTTCOMM_KERN_STREAM_FAIL; - goto error; - } - /* Update the stream global counter */ - cmd_ctx->session->kernel_session->stream_count_global += ret; - } - } +/* + * Command LTTNG_REGISTER_CONSUMER processed by the client thread. + */ +static int cmd_register_consumer(struct ltt_session *session, int domain, + char *sock_path) +{ + int ret, sock; - DBG("Start kernel tracing"); - ret = kernel_start_session(cmd_ctx->session->kernel_session); - if (ret < 0) { - ERR("Kernel start session failed"); - ret = LTTCOMM_KERN_START_FAIL; - goto error; - } + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + /* Can't register a consumer if there is already one */ + if (session->kernel_session->consumer_fd != 0) { + ret = LTTCOMM_KERN_CONSUMER_FAIL; + goto error; + } - ret = start_kernel_trace(cmd_ctx->session->kernel_session); - if (ret < 0) { - ret = LTTCOMM_KERN_START_FAIL; - goto error; - } + sock = lttcomm_connect_unix_sock(sock_path); + if (sock < 0) { + ret = LTTCOMM_CONNECT_FAIL; + goto error; + } - /* Quiescent wait after starting trace */ - kernel_wait_quiescent(kernel_tracer_fd); + session->kernel_session->consumer_fd = sock; + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; + } + + ret = LTTCOMM_OK; + +error: + return ret; +} + +/* + * Command LTTNG_LIST_DOMAINS processed by the client thread. + */ +static ssize_t cmd_list_domains(struct ltt_session *session, + struct lttng_domain **domains) +{ + int ret; + ssize_t nb_dom = 0; + + if (session->kernel_session != NULL) { + nb_dom++; + } + + nb_dom += session->ust_session_list.count; + + *domains = malloc(nb_dom * sizeof(struct lttng_domain)); + if (*domains == NULL) { + ret = -LTTCOMM_FATAL; + goto error; + } + + (*domains)[0].type = LTTNG_DOMAIN_KERNEL; + + /* TODO: User-space tracer domain support */ + + return nb_dom; + +error: + return ret; +} + +/* + * Command LTTNG_LIST_CHANNELS processed by the client thread. + */ +static ssize_t cmd_list_channels(struct ltt_session *session, + struct lttng_channel **channels) +{ + int ret; + ssize_t nb_chan = 0; + + if (session->kernel_session != NULL) { + nb_chan += session->kernel_session->channel_count; + } + + *channels = malloc(nb_chan * sizeof(struct lttng_channel)); + if (*channels == NULL) { + ret = -LTTCOMM_FATAL; + goto error; + } + + list_lttng_channels(session, *channels); + + return nb_chan; + +error: + return ret; +} + +/* + * Command LTTNG_LIST_EVENTS processed by the client thread. + */ +static ssize_t cmd_list_events(struct ltt_session *session, + char *channel_name, struct lttng_event **events) +{ + int ret; + ssize_t nb_event = 0; + struct ltt_kernel_channel *kchan = NULL; + + if (session->kernel_session != NULL) { + kchan = trace_kernel_get_channel_by_name(channel_name, + session->kernel_session); + if (kchan == NULL) { + ret = -LTTCOMM_KERN_CHAN_NOT_FOUND; + goto error; } + nb_event += kchan->event_count; + } + + *events = malloc(nb_event * sizeof(struct lttng_event)); + if (*events == NULL) { + ret = -LTTCOMM_FATAL; + goto error; + } - /* TODO: Start all UST traces */ + list_lttng_events(kchan, *events); - ret = LTTCOMM_OK; + /* TODO: User-space tracer support */ + + return nb_event; + +error: + return ret; +} + +/* + * 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 = LTTCOMM_OK; + int need_tracing_session = 1; + + DBG("Processing client command %d", cmd_ctx->lsm->cmd_type); + + /* + * Check for command that don't needs to allocate a returned payload. We do + * this here so we don't have to make the call for no payload at each + * command. + */ + switch(cmd_ctx->lsm->cmd_type) { + case LTTNG_LIST_SESSIONS: + case LTTNG_LIST_TRACEPOINTS: + case LTTNG_LIST_DOMAINS: + case LTTNG_LIST_CHANNELS: + case LTTNG_LIST_EVENTS: break; - } - case LTTNG_STOP_TRACE: - { - struct ltt_kernel_channel *chan; + default: /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); if (ret < 0) { - goto setup_error; + /* This label does not try to unlock the session */ + goto init_setup_error; } + } - /* Kernel tracer */ - if (cmd_ctx->session->kernel_session != NULL) { - DBG("Stop kernel tracing"); + /* Commands that DO NOT need a session. */ + switch (cmd_ctx->lsm->cmd_type) { + case LTTNG_CALIBRATE: + case LTTNG_CREATE_SESSION: + case LTTNG_LIST_SESSIONS: + case LTTNG_LIST_TRACEPOINTS: + need_tracing_session = 0; + break; + default: + DBG("Getting session %s by name", cmd_ctx->lsm->session.name); + cmd_ctx->session = session_find_by_name(cmd_ctx->lsm->session.name); + if (cmd_ctx->session == NULL) { + if (cmd_ctx->lsm->session.name != NULL) { + ret = LTTCOMM_SESS_NOT_FOUND; + } else { + /* If no session name specified */ + ret = LTTCOMM_SELECT_SESS; + } + goto error; + } else { + /* Acquire lock for the session */ + session_lock(cmd_ctx->session); + } + break; + } - ret = kernel_metadata_flush_buffer(cmd_ctx->session->kernel_session->metadata_stream_fd); - if (ret < 0) { - ERR("Kernel metadata flush failed"); + /* + * Check domain type for specific "pre-action". + */ + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + /* Kernel tracer check */ + if (kernel_tracer_fd == 0) { + /* Basically, load kernel tracer modules */ + init_kernel_tracer(); + if (kernel_tracer_fd == 0) { + ret = LTTCOMM_KERN_NA; + goto error; } + } - cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) { - ret = kernel_flush_buffer(chan); + /* Need a session for kernel command */ + if (need_tracing_session) { + if (cmd_ctx->session->kernel_session == NULL) { + ret = create_kernel_session(cmd_ctx->session); if (ret < 0) { - ERR("Kernel flush buffer error"); + ret = LTTCOMM_KERN_SESS_FAIL; + goto error; } } - ret = kernel_stop_session(cmd_ctx->session->kernel_session); - if (ret < 0) { - ERR("Kernel stop session failed"); - ret = LTTCOMM_KERN_STOP_FAIL; - goto error; + /* Start the kernel consumer daemon */ + if (kconsumerd_pid == 0 && + cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) { + ret = start_kconsumerd(); + if (ret < 0) { + ret = LTTCOMM_KERN_CONSUMER_FAIL; + goto error; + } } - - /* Quiescent wait after stopping trace */ - kernel_wait_quiescent(kernel_tracer_fd); } + break; + case LTTNG_DOMAIN_UST_PID: + { + struct ltt_ust_session *usess; + + if (need_tracing_session) { + usess = trace_ust_get_session_by_pid( + &cmd_ctx->session->ust_session_list, + cmd_ctx->lsm->domain.attr.pid); + if (usess == NULL) { + ret = create_ust_session(cmd_ctx->session, + &cmd_ctx->lsm->domain); + if (ret != LTTCOMM_OK) { + goto error; + } + } + } + break; + } + default: + /* TODO Userspace tracer */ + break; + } - /* TODO : User-space tracer */ - + /* Process by command type */ + switch (cmd_ctx->lsm->cmd_type) { + case LTTNG_ADD_CONTEXT: + { + ret = cmd_add_context(cmd_ctx->session, cmd_ctx->lsm->domain.type, + cmd_ctx->lsm->u.context.channel_name, + cmd_ctx->lsm->u.context.event_name, + &cmd_ctx->lsm->u.context.ctx); + break; + } + case LTTNG_DISABLE_CHANNEL: + { + ret = cmd_disable_channel(cmd_ctx->session, cmd_ctx->lsm->domain.type, + cmd_ctx->lsm->u.disable.channel_name); + break; + } + case LTTNG_DISABLE_EVENT: + { + ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type, + cmd_ctx->lsm->u.disable.channel_name, + cmd_ctx->lsm->u.disable.name); ret = LTTCOMM_OK; break; } - case LTTNG_CREATE_SESSION: + case LTTNG_DISABLE_ALL_EVENT: { - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - ret = create_session(cmd_ctx->lsm->session_name, cmd_ctx->lsm->path); - if (ret < 0) { - if (ret == -EEXIST) { - ret = LTTCOMM_EXIST_SESS; - } else { - ret = LTTCOMM_FATAL; - } - goto error; - } + DBG("Disabling all kernel event"); - ret = LTTCOMM_OK; + ret = cmd_disable_event_all(cmd_ctx->session, cmd_ctx->lsm->domain.type, + cmd_ctx->lsm->u.disable.channel_name); break; } - case LTTNG_DESTROY_SESSION: + case LTTNG_ENABLE_CHANNEL: { - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } + ret = cmd_enable_channel(cmd_ctx->session, &cmd_ctx->lsm->domain, + &cmd_ctx->lsm->u.channel.chan); + break; + } + case LTTNG_ENABLE_EVENT: + { + ret = cmd_enable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type, + cmd_ctx->lsm->u.enable.channel_name, + &cmd_ctx->lsm->u.enable.event); + break; + } + case LTTNG_ENABLE_ALL_EVENT: + { + DBG("Enabling all kernel event"); - /* Clean kernel session teardown */ - teardown_kernel_session(cmd_ctx->session); + ret = cmd_enable_event_all(cmd_ctx->session, cmd_ctx->lsm->domain.type, + cmd_ctx->lsm->u.enable.channel_name, + cmd_ctx->lsm->u.enable.event.type); + break; + } + case LTTNG_LIST_TRACEPOINTS: + { + struct lttng_event *events; + ssize_t nb_events; - ret = destroy_session(cmd_ctx->lsm->session_name); - if (ret < 0) { - ret = LTTCOMM_FATAL; + nb_events = cmd_list_tracepoints(cmd_ctx->lsm->domain.type, &events); + if (nb_events < 0) { + ret = -nb_events; goto error; } /* - * Must notify the kernel thread here to update it's pollfd in order to - * remove the channel(s)' fd just destroyed. + * Setup lttng message with payload size set to the event list size in + * bytes and then copy list into the llm payload. */ - ret = notify_kernel_pollfd(); + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_event) * nb_events); if (ret < 0) { - ret = LTTCOMM_FATAL; - goto error; + free(events); + goto setup_error; } + /* Copy event list into message payload */ + memcpy(cmd_ctx->llm->payload, events, + sizeof(struct lttng_event) * nb_events); + + free(events); + ret = LTTCOMM_OK; break; } - /* - case UST_CREATE_TRACE: + case LTTNG_START_TRACE: { - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - ret = ust_create_trace(cmd_ctx); - if (ret < 0) { - goto error; - } + ret = cmd_start_trace(cmd_ctx->session); break; } - case UST_START_TRACE: + case LTTNG_STOP_TRACE: { - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - ret = ust_start_trace(cmd_ctx); - if (ret < 0) { - goto setup_error; - } + ret = cmd_stop_trace(cmd_ctx->session); break; } - case UST_STOP_TRACE: + case LTTNG_CREATE_SESSION: { - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - ret = ust_stop_trace(cmd_ctx); - if (ret < 0) { - goto setup_error; - } + ret = cmd_create_session(cmd_ctx->lsm->session.name, + cmd_ctx->lsm->session.path); + break; + } + case LTTNG_DESTROY_SESSION: + { + ret = cmd_destroy_session(cmd_ctx->session, + cmd_ctx->lsm->session.name); break; } - */ case LTTNG_LIST_DOMAINS: { - size_t nb_dom = 0; + ssize_t nb_dom; + struct lttng_domain *domains; - if (cmd_ctx->session->kernel_session != NULL) { - nb_dom++; + nb_dom = cmd_list_domains(cmd_ctx->session, &domains); + if (nb_dom < 0) { + ret = -nb_dom; + goto error; } - nb_dom += cmd_ctx->session->ust_trace_count; - - ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_domain) * nb_dom); + ret = setup_lttng_msg(cmd_ctx, nb_dom * sizeof(struct lttng_domain)); if (ret < 0) { goto setup_error; } - ((struct lttng_domain *)(cmd_ctx->llm->payload))[0].type = - LTTNG_DOMAIN_KERNEL; + /* Copy event list into message payload */ + memcpy(cmd_ctx->llm->payload, domains, + nb_dom * sizeof(struct lttng_domain)); + + free(domains); - /* TODO: User-space tracer domain support */ ret = LTTCOMM_OK; break; } case LTTNG_LIST_CHANNELS: { - /* - * 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; + size_t nb_chan; + struct lttng_channel *channels; + + nb_chan = cmd_list_channels(cmd_ctx->session, &channels); + if (nb_chan < 0) { + ret = -nb_chan; + goto error; } - ret = setup_lttng_msg(cmd_ctx, - sizeof(struct lttng_channel) * nb_chan); + ret = setup_lttng_msg(cmd_ctx, nb_chan * sizeof(struct lttng_channel)); if (ret < 0) { goto setup_error; } - list_lttng_channels(cmd_ctx->session, - (struct lttng_channel *)(cmd_ctx->llm->payload)); + /* Copy event list into message payload */ + memcpy(cmd_ctx->llm->payload, channels, + nb_chan * sizeof(struct lttng_channel)); + + free(channels); ret = LTTCOMM_OK; break; } case LTTNG_LIST_EVENTS: { - /* - * 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; + size_t nb_event; + struct lttng_event *events = NULL; + + nb_event = cmd_list_events(cmd_ctx->session, + cmd_ctx->lsm->u.list.channel_name, &events); + if (nb_event < 0) { + ret = -nb_event; + goto error; } - ret = setup_lttng_msg(cmd_ctx, - sizeof(struct lttng_event) * nb_event); + ret = setup_lttng_msg(cmd_ctx, nb_event * sizeof(struct lttng_event)); if (ret < 0) { goto setup_error; } - DBG("Listing events (%ld events)", nb_event); + /* Copy event list into message payload */ + memcpy(cmd_ctx->llm->payload, events, + nb_event * sizeof(struct lttng_event)); - list_lttng_events(kchan, - (struct lttng_event *)(cmd_ctx->llm->payload)); + free(events); ret = LTTCOMM_OK; break; } case LTTNG_LIST_SESSIONS: { - lock_session_list(); + session_lock_list(); if (session_list_ptr->count == 0) { ret = LTTCOMM_NO_SESSION; - unlock_session_list(); + session_unlock_list(); goto error; } ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * session_list_ptr->count); if (ret < 0) { - unlock_session_list(); + session_unlock_list(); goto setup_error; } /* Filled the session array */ list_lttng_sessions((struct lttng_session *)(cmd_ctx->llm->payload)); - unlock_session_list(); + session_unlock_list(); ret = LTTCOMM_OK; break; } + case LTTNG_CALIBRATE: + { + ret = cmd_calibrate(cmd_ctx->lsm->domain.type, + &cmd_ctx->lsm->u.calibrate); + break; + } + case LTTNG_REGISTER_CONSUMER: + { + ret = cmd_register_consumer(cmd_ctx->session, cmd_ctx->lsm->domain.type, + cmd_ctx->lsm->u.reg.path); + break; + } default: - /* Undefined command */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - ret = LTTCOMM_UND; break; } - /* Set return code */ - cmd_ctx->llm->ret_code = ret; - - if (cmd_ctx->session) { - unlock_session(cmd_ctx->session); - } - - return ret; - error: if (cmd_ctx->llm == NULL) { DBG("Missing llm structure. Allocating one."); @@ -2030,13 +2824,13 @@ error: goto setup_error; } } - /* Notify client of error */ + /* Set return code */ cmd_ctx->llm->ret_code = ret; - setup_error: if (cmd_ctx->session) { - unlock_session(cmd_ctx->session); + session_unlock(cmd_ctx->session); } +init_setup_error: return ret; } @@ -2046,9 +2840,10 @@ setup_error: */ static void *thread_manage_clients(void *data) { - int sock = 0, ret; + int sock = 0, ret, i, pollfd; + uint32_t revents, nb_fd; struct command_ctx *cmd_ctx = NULL; - struct pollfd pollfd[2]; + struct lttng_poll_event events; DBG("[thread] Manage client started"); @@ -2057,15 +2852,23 @@ static void *thread_manage_clients(void *data) goto error; } - /* First fd is always the quit pipe */ - pollfd[0].fd = thread_quit_pipe[0]; + /* + * Pass 2 as size here for the thread quit pipe and client_sock. Nothing + * more will be added to this poll set. + */ + ret = create_thread_poll_set(&events, 2); + if (ret < 0) { + goto error; + } - /* Apps socket */ - pollfd[1].fd = client_sock; - pollfd[1].events = POLLIN; + /* Add the application registration socket */ + ret = lttng_poll_add(&events, client_sock, LPOLLIN | LPOLLPRI); + if (ret < 0) { + goto error; + } - /* Notify parent pid that we are ready - * to accept command for client side. + /* + * Notify parent pid that we are ready to accept command for client side. */ if (opt_sig_parent) { kill(ppid, SIGCHLD); @@ -2074,21 +2877,36 @@ static void *thread_manage_clients(void *data) while (1) { DBG("Accepting client command ..."); + nb_fd = LTTNG_POLL_GETNB(&events); + /* Inifinite blocking call, waiting for transmission */ - ret = poll(pollfd, 2, -1); + ret = lttng_poll_wait(&events, -1); if (ret < 0) { - perror("poll client thread"); goto error; } - /* Thread quit pipe has been closed. Killing thread. */ - if (pollfd[0].revents == POLLNVAL) { - goto error; - } else if (pollfd[1].revents == POLLERR) { - ERR("Client socket poll error"); - goto error; + for (i = 0; i < nb_fd; i++) { + /* Fetch once the poll data */ + revents = LTTNG_POLL_GETEV(&events, i); + pollfd = LTTNG_POLL_GETFD(&events, i); + + /* Thread quit pipe has been closed. Killing thread. */ + ret = check_thread_quit_pipe(pollfd, revents); + if (ret) { + goto error; + } + + /* Event on the registration socket */ + if (pollfd == client_sock) { + if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + ERR("Client socket poll error"); + goto error; + } + } } + DBG("Wait for client response"); + sock = lttcomm_accept_unix_sock(client_sock); if (sock < 0) { goto error; @@ -2096,9 +2914,18 @@ static void *thread_manage_clients(void *data) /* Allocate context command to process the client request */ cmd_ctx = malloc(sizeof(struct command_ctx)); + if (cmd_ctx == NULL) { + perror("malloc cmd_ctx"); + goto error; + } /* Allocate data buffer for reception */ cmd_ctx->lsm = malloc(sizeof(struct lttcomm_session_msg)); + if (cmd_ctx->lsm == NULL) { + perror("malloc cmd_ctx->lsm"); + goto error; + } + cmd_ctx->llm = NULL; cmd_ctx->session = NULL; @@ -2108,12 +2935,17 @@ static void *thread_manage_clients(void *data) * the client. */ DBG("Receiving data from client ..."); - ret = lttcomm_recv_unix_sock(sock, cmd_ctx->lsm, sizeof(struct lttcomm_session_msg)); + ret = lttcomm_recv_unix_sock(sock, cmd_ctx->lsm, + sizeof(struct lttcomm_session_msg)); if (ret <= 0) { + DBG("Nothing recv() from client... continuing"); + close(sock); + free(cmd_ctx); continue; } - // TODO: Validate cmd_ctx including sanity check for security purpose. + // TODO: Validate cmd_ctx including sanity check for + // security purpose. /* * This function dispatch the work to the kernel or userspace tracer @@ -2123,15 +2955,18 @@ static void *thread_manage_clients(void *data) */ ret = process_client_msg(cmd_ctx); if (ret < 0) { - /* TODO: Inform client somehow of the fatal error. At this point, - * ret < 0 means that a malloc failed (ENOMEM). */ - /* Error detected but still accept command */ + /* + * TODO: Inform client somehow of the fatal error. At + * this point, ret < 0 means that a malloc failed + * (ENOMEM). Error detected but still accept command. + */ clean_command_ctx(&cmd_ctx); continue; } - DBG("Sending response (size: %d, retcode: %d)", - cmd_ctx->lttng_msg_size, cmd_ctx->llm->ret_code); + DBG("Sending response (size: %d, retcode: %s)", + cmd_ctx->lttng_msg_size, + lttng_get_readable_code(-cmd_ctx->llm->ret_code)); ret = send_unix_sock(sock, cmd_ctx->llm, cmd_ctx->lttng_msg_size); if (ret < 0) { ERR("Failed to send data back to client"); @@ -2145,15 +2980,11 @@ static void *thread_manage_clients(void *data) error: DBG("Client thread dying"); - if (client_sock) { - close(client_sock); - } - if (sock) { - close(sock); - } - unlink(client_unix_sock_path); + close(client_sock); + close(sock); + lttng_poll_clean(&events); clean_command_ctx(&cmd_ctx); return NULL; } @@ -2176,6 +3007,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"); } /* @@ -2197,12 +3029,14 @@ 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; } @@ -2248,6 +3082,9 @@ static int parse_args(int argc, char **argv) /* Verbose level can increase using multiple -v */ opt_verbose += 1; break; + case 'Z': + opt_verbose_kconsumerd += 1; + break; default: /* Unknown option or other error. * Error is printed by getopt, just return */ @@ -2263,7 +3100,7 @@ static int parse_args(int argc, char **argv) * 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; @@ -2295,7 +3132,8 @@ static int init_daemon_socket() } /* File permission MUST be 666 */ - ret = chmod(apps_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); + ret = chmod(apps_unix_sock_path, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); if (ret < 0) { ERR("Set file permissions failed: %s", apps_unix_sock_path); perror("chmod"); @@ -2308,18 +3146,22 @@ end: } /* - * 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); + if (access(client_unix_sock_path, F_OK) < 0 && + access(apps_unix_sock_path, F_OK) < 0) { + return 0; } - return ret; + /* Is there anybody out there ? */ + if (lttng_session_daemon_alive()) { + return -EEXIST; + } else { + return 0; + } } /* @@ -2331,14 +3173,10 @@ static int check_existing_daemon() 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; @@ -2350,21 +3188,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"); @@ -2384,6 +3222,14 @@ static int create_kernel_poll_pipe(void) return pipe2(kernel_poll_pipe, O_CLOEXEC); } +/* + * Create the application command pipe to wake thread_manage_apps. + */ +static int create_apps_cmd_pipe(void) +{ + return pipe2(apps_cmd_pipe, O_CLOEXEC); +} + /* * Create the lttng run directory needed for all global sockets and pipe. */ @@ -2414,11 +3260,13 @@ static int set_kconsumerd_sockets(void) int ret; if (strlen(kconsumerd_err_unix_sock_path) == 0) { - snprintf(kconsumerd_err_unix_sock_path, PATH_MAX, KCONSUMERD_ERR_SOCK_PATH); + snprintf(kconsumerd_err_unix_sock_path, PATH_MAX, + KCONSUMERD_ERR_SOCK_PATH); } if (strlen(kconsumerd_cmd_unix_sock_path) == 0) { - snprintf(kconsumerd_cmd_unix_sock_path, PATH_MAX, KCONSUMERD_CMD_SOCK_PATH); + snprintf(kconsumerd_cmd_unix_sock_path, PATH_MAX, + KCONSUMERD_CMD_SOCK_PATH); } ret = mkdir(KCONSUMERD_PATH, S_IRWXU | S_IRWXG); @@ -2431,7 +3279,8 @@ static int set_kconsumerd_sockets(void) } /* Create the kconsumerd error unix socket */ - kconsumerd_err_sock = lttcomm_create_unix_sock(kconsumerd_err_unix_sock_path); + kconsumerd_err_sock = + lttcomm_create_unix_sock(kconsumerd_err_unix_sock_path); if (kconsumerd_err_sock < 0) { ERR("Create unix sock failed: %s", kconsumerd_err_unix_sock_path); ret = -1; @@ -2439,7 +3288,8 @@ static int set_kconsumerd_sockets(void) } /* File permission MUST be 660 */ - ret = chmod(kconsumerd_err_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + ret = chmod(kconsumerd_err_unix_sock_path, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); if (ret < 0) { ERR("Set file permissions failed: %s", kconsumerd_err_unix_sock_path); perror("chmod"); @@ -2452,26 +3302,27 @@ error: /* * 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); } /* @@ -2541,14 +3392,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 */ @@ -2556,7 +3407,7 @@ int main(int argc, char **argv) ret = daemon(0, 0); if (ret < 0) { perror("daemon"); - goto exit; + goto error; } } @@ -2566,7 +3417,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) { @@ -2578,12 +3429,19 @@ int main(int argc, char **argv) snprintf(client_unix_sock_path, PATH_MAX, DEFAULT_GLOBAL_CLIENT_UNIX_SOCK); } + + /* Set global SHM for ust */ + if (strlen(wait_shm_path) == 0) { + snprintf(wait_shm_path, PATH_MAX, + DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH); + } } 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 exit; + ret = -EPERM; + goto error; } if (strlen(apps_unix_sock_path) == 0) { @@ -2596,26 +3454,30 @@ int main(int argc, char **argv) snprintf(client_unix_sock_path, PATH_MAX, DEFAULT_HOME_CLIENT_UNIX_SOCK, home_path); } + + /* Set global SHM for ust */ + if (strlen(wait_shm_path) == 0) { + snprintf(wait_shm_path, PATH_MAX, + DEFAULT_HOME_APPS_WAIT_SHM_PATH, geteuid()); + } } DBG("Client socket path %s", client_unix_sock_path); DBG("Application socket path %s", apps_unix_sock_path); /* - * See if daemon already exist. If any of the two socket needed by the - * daemon are present, this test fails. 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 */ + /* After this point, we can safely call cleanup() with "goto exit" */ /* * These actions must be executed as root. We do that *after* setting up @@ -2626,7 +3488,7 @@ int main(int argc, char **argv) if (is_root) { ret = set_kconsumerd_sockets(); if (ret < 0) { - goto error; + goto exit; } /* Setup kernel tracer */ @@ -2636,18 +3498,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. */ @@ -2656,51 +3518,115 @@ 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; + } + + /* Setup the thread apps communication pipe. */ + if ((ret = create_apps_cmd_pipe()) < 0) { + goto exit; } + /* Init UST command queue. */ + cds_wfq_init(&ust_cmd_queue.queue); + /* - * Get session list pointer. This pointer MUST NOT be free(). - * This list is statically declared in session.c + * Get session list pointer. This pointer MUST NOT be free(). This list is + * statically declared in session.c */ - session_list_ptr = get_session_list(); + session_list_ptr = session_get_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; - } + /* Set up max poll set size */ + lttng_poll_set_max_size(); - /* 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 the client socket */ + ret = pthread_create(&client_thread, NULL, + thread_manage_clients, (void *) NULL); + if (ret != 0) { + perror("pthread_create clients"); + goto exit_client; + } - /* 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 thread to dispatch registration */ + ret = pthread_create(&dispatch_thread, NULL, + thread_dispatch_ust_registration, (void *) NULL); + if (ret != 0) { + perror("pthread_create dispatch"); + goto exit_dispatch; + } - ret = pthread_join(client_thread, &status); - if (ret != 0) { - perror("pthread_join"); - goto error; - } + /* Create thread to manage application registration. */ + ret = pthread_create(®_apps_thread, NULL, + thread_registration_apps, (void *) NULL); + if (ret != 0) { + perror("pthread_create registration"); + goto exit_reg_apps; } - cleanup(); - exit(EXIT_SUCCESS); + /* Create thread to manage application socket */ + ret = pthread_create(&apps_thread, NULL, + thread_manage_apps, (void *) NULL); + if (ret != 0) { + perror("pthread_create apps"); + goto exit_apps; + } -error: - cleanup(); + /* Create kernel thread to manage kernel event */ + ret = pthread_create(&kernel_thread, NULL, + thread_manage_kernel, (void *) NULL); + if (ret != 0) { + perror("pthread_create kernel"); + goto exit_kernel; + } + + ret = pthread_join(kernel_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ + } + +exit_kernel: + ret = pthread_join(apps_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ + } +exit_apps: + ret = pthread_join(reg_apps_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ + } + +exit_reg_apps: + ret = pthread_join(dispatch_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ + } + +exit_dispatch: + 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); }