X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=46c98a5611b9e818c0c99e7e7a64bcd56a02b60e;hp=edbdd643a84f5e1c69b3118663af7fafb2b274fa;hb=133842876fe8a87ba184c9ac2b6e004eb388fb73;hpb=f8f0c3d1337c4eda5fb76a323ffe6c21c926a21e diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index edbdd643a..46c98a561 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -1,20 +1,19 @@ /* * Copyright (C) 2011 - David Goulet - * Copyright (C) 2011 - Mathieu Desnoyers + * 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 @@ -22,18 +21,20 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include #include #include +#include +#include #include #include @@ -41,14 +42,18 @@ #include #include +#include "channel.h" +#include "compat/poll.h" #include "context.h" +#include "event.h" #include "futex.h" #include "kernel-ctl.h" #include "ltt-sessiond.h" -#include "traceable-app.h" +#include "shm.h" +#include "ust-app.h" #include "ust-ctl.h" #include "utils.h" -#include "ust-comm.h" +#include "ust-ctl.h" /* Const values */ const char default_home_dir[] = DEFAULT_HOME_DIR; @@ -68,13 +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 int dispatch_thread_exit; -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 */ +/* 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; @@ -105,9 +114,9 @@ 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 */ -static int modprobe_remove_kernel_modules(void); +/* 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 @@ -126,10 +135,92 @@ static struct ust_cmd_queue ust_cmd_queue; * 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; +/* + * 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; @@ -147,7 +238,7 @@ static gid_t allowed_group(void) } /* - * Init quit pipe. + * Init thread quit pipe. * * Return -1 on error or 0 if all pipes are created. */ @@ -193,10 +284,15 @@ static void teardown_kernel_session(struct ltt_session *session) */ static void stop_threads(void) { + int ret; + /* Stopping all threads */ DBG("Terminating all threads"); - close(thread_quit_pipe[0]); - close(thread_quit_pipe[1]); + 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); @@ -214,21 +310,23 @@ static void cleanup(void) 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); /* */ - 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"); @@ -238,22 +336,28 @@ static void cleanup(void) 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"); - clean_traceable_apps_list(); + ust_app_clean_list(); pthread_mutex_destroy(&kconsumerd_pid_mutex); DBG("Closing kernel fd"); close(kernel_tracer_fd); - DBG("Unloading kernel modules"); - modprobe_remove_kernel_modules(); + if (is_root) { + DBG("Unloading kernel modules"); + modprobe_remove_kernel_modules(); + } + + close(thread_quit_pipe[0]); + close(thread_quit_pipe[1]); } /* @@ -292,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; @@ -300,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; @@ -310,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; @@ -327,7 +434,8 @@ static int send_kconsumerd_channel_fds(int sock, struct ltt_kernel_channel *chan 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; @@ -359,7 +467,8 @@ static int send_kconsumerd_fds(struct ltt_kernel_session *session) DBG("Sending kconsumerd header for metadata"); - ret = lttcomm_send_unix_sock(session->consumer_fd, &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; @@ -381,7 +490,8 @@ static int send_kconsumerd_fds(struct ltt_kernel_session *session) strncpy(lkm.path_name, session->metadata->pathname, PATH_MAX); lkm.path_name[PATH_MAX - 1] = '\0'; - ret = lttcomm_send_fds_unix_sock(session->consumer_fd, &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; @@ -403,65 +513,30 @@ 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; -} - /* - * 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; } -#endif /* DISABLED */ /* * Setup the outgoing data buffer for the response (llm) by allocating the @@ -497,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. @@ -581,11 +626,11 @@ 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; } @@ -594,36 +639,38 @@ static int update_kernel_stream(int fd) session->kernel_session->consumer_fd = kconsumerd_cmd_sock; } - cds_list_for_each_entry(channel, &session->kernel_session->channel_list.head, list) { + 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(session->kernel_session->consumer_fd, - 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; } @@ -635,79 +682,99 @@ 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) { + /* + * Reset number of fd in the poll set. Always 2 since there is the thread + * quit pipe and the kernel pipe. + */ + events.nb_fd = 2; + + 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; } @@ -716,9 +783,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"); @@ -727,26 +795,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); @@ -755,13 +843,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"); @@ -776,27 +866,49 @@ static void *thread_manage_kconsumerd(void *data) goto error; } - /* Kconsumerd err socket */ - pollfd[1].fd = sock; - pollfd[1].events = POLLIN; - - /* Inifinite blocking call, waiting for transmission */ - ret = poll(pollfd, 2, -1); + /* Remove the kconsumerd error sock since we've established a connexion */ + ret = lttng_poll_del(&events, kconsumerd_err_sock); if (ret < 0) { - perror("poll kconsumerd thread"); goto error; } - /* Thread quit pipe has been closed. Killing thread. */ - if (pollfd[0].revents == POLLNVAL) { + ret = lttng_poll_add(&events, sock, LPOLLIN | LPOLLRDHUP); + if (ret < 0) { goto error; - } else if (pollfd[1].revents == POLLERR) { - ERR("Kconsumerd err socket second poll 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; @@ -806,164 +918,127 @@ 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; } /* - * Reallocate the apps command pollfd structure of nb_fd size. - * - * The first two fds must be there at all time. + * This thread manage application communication. */ -static int update_apps_cmd_pollfd(unsigned int nb_fd, struct pollfd **pollfd) +static void *thread_manage_apps(void *data) { - /* Can't accept pollfd less than 2 */ - if (nb_fd < 2) { - goto end; - } + int i, ret, pollfd; + uint32_t revents, nb_fd; + struct ust_command ust_cmd; + struct lttng_poll_event events; + + DBG("[thread] Manage application started"); - *pollfd = realloc(*pollfd, nb_fd * sizeof(struct pollfd)); - if (*pollfd == NULL) { - perror("realloc manage apps pollfd"); + ret = create_thread_poll_set(&events, 2); + if (ret < 0) { goto error; } - /* First fd is always the quit pipe */ - (*pollfd)[0].fd = thread_quit_pipe[0]; - /* Apps command pipe */ - (*pollfd)[1].fd = apps_cmd_pipe[0]; - (*pollfd)[1].events = POLLIN; + ret = lttng_poll_add(&events, apps_cmd_pipe[0], LPOLLIN | LPOLLRDHUP); + if (ret < 0) { + goto error; + } - DBG("Apps cmd pollfd realloc of size %d", nb_fd); + while (1) { + /* Zeroed the events structure */ + lttng_poll_reset(&events); -end: - return 0; + nb_fd = LTTNG_POLL_GETNB(&events); -error: - return -1; -} + DBG("Apps thread polling on %d fds", nb_fd); -/* - * Send registration done packet to the application. - */ -static int send_ust_register_done(int sock) -{ - struct lttcomm_ust_msg lum; + /* Inifinite blocking call, waiting for transmission */ + ret = lttng_poll_wait(&events, -1); + if (ret < 0) { + goto error; + } - DBG("Sending register done command to %d", sock); + for (i = 0; i < nb_fd; i++) { + /* Fetch once the poll data */ + revents = LTTNG_POLL_GETEV(&events, i); + pollfd = LTTNG_POLL_GETFD(&events, i); - lum.cmd = LTTNG_UST_REGISTER_DONE; - lum.handle = LTTNG_UST_ROOT_HANDLE; + /* Thread quit pipe has been closed. Killing thread. */ + ret = check_thread_quit_pipe(pollfd, revents); + if (ret) { + goto error; + } - return ustcomm_send_command(sock, &lum); -} - -/* - * This thread manage application communication. - */ -static void *thread_manage_apps(void *data) -{ - int i, ret, count; - unsigned int nb_fd = 2; - int update_poll_flag = 1; - struct pollfd *pollfd = NULL; - struct ust_command ust_cmd; - - DBG("[thread] Manage application started"); - - ust_cmd.sock = -1; - - while (1) { - /* See if we have a valid socket to add to pollfd */ - if (ust_cmd.sock != -1) { - nb_fd++; - update_poll_flag = 1; - } - - /* The pollfd struct must be updated */ - if (update_poll_flag) { - ret = update_apps_cmd_pollfd(nb_fd, &pollfd); - if (ret < 0) { - /* malloc failed so we quit */ - goto error; - } - if (ust_cmd.sock != -1) { - /* Update pollfd with the new UST socket */ - DBG("Adding sock %d to apps cmd pollfd", ust_cmd.sock); - pollfd[nb_fd - 1].fd = ust_cmd.sock; - pollfd[nb_fd - 1].events = POLLHUP | POLLNVAL; - ust_cmd.sock = -1; - } - } - - DBG("Apps thread polling on %d fds", nb_fd); - - /* Inifinite blocking call, waiting for transmission */ - ret = poll(pollfd, nb_fd, -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 command pipe poll error"); - goto error; - } else if (pollfd[1].revents == POLLIN) { - /* 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; - } + /* 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 = register_traceable_app(&ust_cmd.reg_msg, ust_cmd.sock); - if (ret < 0) { - /* Only critical ENOMEM error can be returned here */ - 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 = send_ust_register_done(ust_cmd.sock); - if (ret < 0) { + 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 { /* - * If the registration is not possible, we simply unregister - * the apps and continue + * At this point, we know that a registered application made + * the event at poll_wait. */ - unregister_traceable_app(ust_cmd.sock); - } - } + if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + /* Removing from the poll set */ + ret = lttng_poll_del(&events, pollfd); + if (ret < 0) { + goto error; + } - count = nb_fd; - for (i = 2; i < count; i++) { - /* Apps socket is closed/hungup */ - switch (pollfd[i].revents) { - case POLLNVAL: - case POLLHUP: - /* Pipe closed */ - unregister_traceable_app(pollfd[i].fd); - nb_fd--; + /* Socket closed */ + ust_app_unregister(pollfd); + break; + } } } - - if (nb_fd != count) { - update_poll_flag = 1; - } } error: @@ -971,7 +1046,7 @@ error: close(apps_cmd_pipe[0]); close(apps_cmd_pipe[1]); - free(pollfd); + lttng_poll_clean(&events); return NULL; } @@ -1003,8 +1078,12 @@ static void *thread_dispatch_ust_registration(void *data) ust_cmd = caa_container_of(node, struct ust_command, node); - DBG("Dispatching UST registration pid:%d sock:%d", - ust_cmd->reg_msg.pid, ust_cmd->sock); + 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 @@ -1041,8 +1120,9 @@ error: */ static void *thread_registration_apps(void *data) { - int sock = 0, ret; - struct pollfd pollfd[2]; + 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. @@ -1056,87 +1136,123 @@ static void *thread_registration_apps(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 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 register 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("Register 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; + } - /* Create UST registration command for enqueuing */ - ust_cmd = malloc(sizeof(struct ust_command)); - if (ust_cmd == NULL) { - perror("ust command malloc"); - goto error; - } + /* 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; + } - /* - * 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)) { - perror("lttcomm_recv_unix_sock register apps"); - free(ust_cmd); - close(sock); - continue; - } + /* Create UST registration command for enqueuing */ + ust_cmd = malloc(sizeof(struct ust_command)); + if (ust_cmd == NULL) { + perror("ust command malloc"); + goto error; + } - ust_cmd->sock = sock; + /* + * 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; + } - /* - * 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); + ust_cmd->sock = sock; - /* - * Wake the registration queue futex. - * Implicit memory barrier with the exchange in cds_wfq_enqueue. - */ - futex_nto1_wake(&ust_cmd_queue.futex); + 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); - DBG("Thread manage apps informed of queued node with sock:%d pid:%d", - sock, ust_cmd->reg_msg.pid); + /* + * 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); + } + } + } } error: - DBG("Register 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; } @@ -1151,7 +1267,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; @@ -1215,7 +1332,8 @@ static pid_t spawn_kconsumerd(void) } 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"); } @@ -1310,42 +1428,6 @@ error: return ret; } -/* - * modprobe_remove_kernel_modules - * Remove modules in reverse load order. - */ -static int modprobe_remove_kernel_modules(void) -{ - int ret = 0, i; - char modprobe[256]; - - for (i = ARRAY_SIZE(kernel_modules_list) - 1; i >= 0; i--) { - ret = snprintf(modprobe, sizeof(modprobe), - "/sbin/modprobe --remove --quiet %s", - kernel_modules_list[i].name); - if (ret < 0) { - 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; -} - /* * mount_debugfs */ @@ -1356,12 +1438,13 @@ static int mount_debugfs(char *path) 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; } @@ -1379,7 +1462,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 */ @@ -1411,6 +1494,7 @@ static void init_kernel_tracer(void) } ret = mount_debugfs(debugfs_path); if (ret < 0) { + perror("Cannot mount debugfs"); goto error; } } @@ -1453,18 +1537,17 @@ 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) { /* - * Assign default kernel consumer 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. + * 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; @@ -1472,7 +1555,6 @@ static int start_kernel_trace(struct ltt_kernel_session *session) ret = send_kconsumerd_fds(session); if (ret < 0) { - ERR("Send kconsumerd fds failed"); ret = LTTCOMM_KERN_CONSUMER_FAIL; goto error; } @@ -1485,60 +1567,61 @@ 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 = NULL; + 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: + ret = LTTCOMM_UNKNOWN_DOMAIN; + goto error; } - return ret; -} - -/* - * Allocate a channel structure and fill it. - */ -static struct lttng_channel *init_default_channel(enum lttng_domain_type domain_type, - 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"); - goto error; + 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; + } } - chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE; - chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER; - chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER; - - switch (domain_type) { - case LTTNG_DOMAIN_KERNEL: - chan->attr.subbuf_size = DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE; - chan->attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM; - chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT; - break; - /* TODO: add UST */ - default: - goto error; /* Not implemented */ + /* Create session on the UST tracer */ + ret = ustctl_create_session(app->sock, lus); + if (ret < 0) { + ret = LTTCOMM_UST_SESS_FAIL; + goto error; } - return chan; + cds_list_add(&lus->list, &session->ust_session_list.head); + session->ust_session_list.count++; + + return LTTCOMM_OK; error: - free(chan); - return NULL; + free(lus); + return ret; } /* @@ -1579,7 +1662,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) { @@ -1613,7 +1696,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; @@ -1658,494 +1742,927 @@ 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); - - /* - * Commands that DO NOT need a session. - */ - switch (cmd_ctx->lsm->cmd_type) { - case LTTNG_CREATE_SESSION: - case LTTNG_LIST_SESSIONS: - case LTTNG_LIST_TRACEPOINTS: - case LTTNG_CALIBRATE: - break; - default: - DBG("Getting session %s by name", cmd_ctx->lsm->session.name); - cmd_ctx->session = find_session_by_name(cmd_ctx->lsm->session.name); - 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; - } - goto error; - } else { - /* Acquire lock for the session */ - lock_session(cmd_ctx->session); - } - break; - } + int ret; - /* - * 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) { - init_kernel_tracer(); - if (kernel_tracer_fd == 0) { - ret = LTTCOMM_KERN_NA; + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + ret = channel_kernel_disable(session->kernel_session, + channel_name); + if (ret != LTTCOMM_OK) { goto error; } - } - /* Need a session for kernel command */ - switch (cmd_ctx->lsm->cmd_type) { - case LTTNG_CALIBRATE: - case LTTNG_CREATE_SESSION: - case LTTNG_LIST_SESSIONS: - case LTTNG_LIST_TRACEPOINTS: + kernel_wait_quiescent(kernel_tracer_fd); + break; + case LTTNG_DOMAIN_UST_PID: break; default: - if (cmd_ctx->session->kernel_session == NULL) { - ret = create_kernel_session(cmd_ctx->session); - if (ret < 0) { - ret = LTTCOMM_KERN_SESS_FAIL; - goto error; - } + ret = LTTCOMM_UNKNOWN_DOMAIN; + goto error; + } - /* Start the kernel consumer daemon */ + ret = LTTCOMM_OK; - if (kconsumerd_pid == 0 && - cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) { - ret = start_kconsumerd(); - if (ret < 0) { - goto error; - } - } - } - } - break; - default: - break; +error: + return ret; +} + +/* + * 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; + + uchan = trace_ust_get_channel_by_name(attr->name, usess); + if (uchan == NULL) { + ret = LTTCOMM_FATAL; + goto error; } - /* Process by command type */ - switch (cmd_ctx->lsm->cmd_type) { - case LTTNG_ADD_CONTEXT: - { - struct lttng_kernel_context kctx; + new_chan = trace_ust_create_channel(attr, usess->path); + if (new_chan == NULL) { + PERROR("malloc ltt_ust_channel"); + ret = LTTCOMM_FATAL; + goto error; + } - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + ret = channel_ust_copy(new_chan, uchan); + if (ret < 0) { + ret = LTTCOMM_FATAL; + goto error; + } + + /* Add channel to the ust app channel list */ + cds_list_add(&new_chan->list, &app->channels.head); + app->channels.count++; + +error: + return ret; +} + +/* + * 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 *kchan; + + 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); } - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - /* Create Kernel context */ - kctx.ctx = cmd_ctx->lsm->u.context.ctx.ctx; - kctx.u.perf_counter.type = cmd_ctx->lsm->u.context.ctx.u.perf_counter.type; - kctx.u.perf_counter.config = cmd_ctx->lsm->u.context.ctx.u.perf_counter.config; - strncpy(kctx.u.perf_counter.name, - cmd_ctx->lsm->u.context.ctx.u.perf_counter.name, - LTTNG_SYMBOL_NAME_LEN); - kctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; - - /* Add kernel context to kernel tracer. See context.c */ - ret = add_kernel_context(cmd_ctx->session->kernel_session, &kctx, - cmd_ctx->lsm->u.context.event_name, - cmd_ctx->lsm->u.context.channel_name); - if (ret != LTTCOMM_OK) { - goto error; - } - break; - default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; + if (ret != LTTCOMM_OK) { goto error; } - ret = LTTCOMM_OK; + kernel_wait_quiescent(kernel_tracer_fd); break; } - case LTTNG_DISABLE_CHANNEL: + case LTTNG_DOMAIN_UST_PID: { - struct ltt_kernel_channel *kchan; + 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; - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (kchan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } else if (kchan->enabled == 1) { - ret = kernel_disable_channel(kchan); - if (ret < 0) { - if (ret != EEXIST) { - ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL; - } - goto error; - } - } - kernel_wait_quiescent(kernel_tracer_fd); - break; - default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; + 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); + } + + if (ret != LTTCOMM_OK) { goto error; } - ret = LTTCOMM_OK; + 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; } - case LTTNG_DISABLE_EVENT: - { - struct ltt_kernel_channel *kchan; - struct ltt_kernel_event *kevent; + default: + ret = LTTCOMM_UNKNOWN_DOMAIN; + goto error; + } - /* 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_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; } - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (kchan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } + ret = event_kernel_disable_tracepoint(session->kernel_session, kchan, event_name); + if (ret != LTTCOMM_OK) { + goto error; + } - kevent = trace_kernel_get_event_by_name(cmd_ctx->lsm->u.disable.name, kchan); - if (kevent != NULL) { - DBG("Disabling kernel event %s for channel %s.", kevent->event->name, - kchan->channel->name); - ret = kernel_disable_event(kevent); - if (ret < 0) { - ret = LTTCOMM_KERN_ENABLE_FAIL; - goto error; - } - } + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; + } - kernel_wait_quiescent(kernel_tracer_fd); - break; - default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_OK; + +error: + return ret; +} + +/* + * 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; } - ret = LTTCOMM_OK; + ret = event_kernel_disable_all(session->kernel_session, kchan); + if (ret != LTTCOMM_OK) { + goto error; + } + + kernel_wait_quiescent(kernel_tracer_fd); break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - case LTTNG_DISABLE_ALL_EVENT: - { - struct ltt_kernel_channel *kchan; - struct ltt_kernel_event *kevent; - /* 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; } - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - DBG("Disabling all enabled kernel events"); - kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (kchan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; + } + + ret = LTTCOMM_OK; + +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; } + } - /* For each event in the kernel session */ - cds_list_for_each_entry(kevent, &kchan->events_list.head, list) { - DBG("Disabling kernel event %s for channel %s.", - kevent->event->name, kchan->channel->name); - ret = kernel_disable_event(kevent); - if (ret < 0) { - continue; - } - } + /* 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; + } - /* Quiescent wait after event disable */ - kernel_wait_quiescent(kernel_tracer_fd); - break; - default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = event_kernel_enable_tracepoint(session->kernel_session, kchan, event); + if (ret != LTTCOMM_OK) { goto error; } - ret = LTTCOMM_OK; + kernel_wait_quiescent(kernel_tracer_fd); break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - case LTTNG_ENABLE_CHANNEL: - { - struct ltt_kernel_channel *kchan; - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } + ret = LTTCOMM_OK; - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, - cmd_ctx->session->kernel_session); - if (kchan == NULL) { - /* Channel not found, creating it */ - DBG("Creating kernel channel"); - - ret = kernel_create_channel(cmd_ctx->session->kernel_session, - &cmd_ctx->lsm->u.channel.chan, - cmd_ctx->session->kernel_session->trace_path); - if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; - goto error; - } +error: + return ret; +} - /* Notify kernel thread that there is a new channel */ - ret = notify_kernel_pollfd(); - if (ret < 0) { - ret = LTTCOMM_FATAL; - goto error; - } - } else if (kchan->enabled == 0) { - ret = kernel_enable_channel(kchan); - if (ret < 0) { - if (ret != EEXIST) { - ret = LTTCOMM_KERN_CHAN_ENABLE_FAIL; - } - goto error; - } +/* + * 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; + + 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; } + } - kernel_wait_quiescent(kernel_tracer_fd); + /* 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: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; + } + if (ret != LTTCOMM_OK) { goto error; } - ret = LTTCOMM_OK; + kernel_wait_quiescent(kernel_tracer_fd); break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - case LTTNG_ENABLE_EVENT: - { - char *channel_name; - struct ltt_kernel_channel *kchan; - struct ltt_kernel_event *kevent; - struct lttng_channel *chan; - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - 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; + } - channel_name = cmd_ctx->lsm->u.enable.channel_name; + return nb_events; - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - kchan = trace_kernel_get_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(cmd_ctx->lsm->domain.type, channel_name); - if (chan == NULL) { - ret = LTTCOMM_FATAL; - goto error; - } +error: + /* Return negative value to differentiate return code */ + return -ret; +} - ret = kernel_create_channel(cmd_ctx->session->kernel_session, - chan, cmd_ctx->session->kernel_session->trace_path); - if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; - goto error; - } - kchan = trace_kernel_get_channel_by_name(channel_name, - cmd_ctx->session->kernel_session); - if (kchan == NULL) { - ERR("Channel %s not found after creation. Internal error, giving up.", - channel_name); - 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; - kevent = trace_kernel_get_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan); - if (kevent == NULL) { - DBG("Creating kernel event %s for channel %s.", - cmd_ctx->lsm->u.enable.event.name, channel_name); - ret = kernel_create_event(&cmd_ctx->lsm->u.enable.event, kchan); - } else { - DBG("Enabling kernel event %s for channel %s.", - kevent->event->name, channel_name); - ret = kernel_enable_event(kevent); - if (ret == -EEXIST) { - ret = LTTCOMM_KERN_EVENT_EXIST; - goto error; - } - } + /* Short cut */ + ksession = session->kernel_session; + /* Kernel tracing */ + if (ksession != NULL) { + /* Open kernel metadata */ + if (ksession->metadata == NULL) { + ret = kernel_open_metadata(ksession, ksession->trace_path); if (ret < 0) { - ret = LTTCOMM_KERN_ENABLE_FAIL; + ret = LTTCOMM_KERN_META_FAIL; goto error; } + } - kernel_wait_quiescent(kernel_tracer_fd); - break; - default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; + /* 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 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) { + ret = LTTCOMM_KERN_STREAM_FAIL; + goto error; + } + /* Update the stream global counter */ + ksession->stream_count_global += ret; + } + } + + /* 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 starting trace */ + kernel_wait_quiescent(kernel_tracer_fd); + } + + /* 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"); + } + } + + ret = kernel_stop_session(ksession); + if (ret < 0) { + ret = LTTCOMM_KERN_STOP_FAIL; + goto error; + } + + kernel_wait_quiescent(kernel_tracer_fd); + } + + /* TODO : User-space tracer */ + + 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; + } + + 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(session); + + 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 lttng_kernel_calibrate kcalibrate; + + kcalibrate.type = calibrate->type; + ret = kernel_calibrate(kernel_tracer_fd, &kcalibrate); + if (ret < 0) { + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; + } + break; + } + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; + } + + ret = LTTCOMM_OK; + +error: + return 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; + + 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; + } + + sock = lttcomm_connect_unix_sock(sock_path); + if (sock < 0) { + ret = LTTCOMM_CONNECT_FAIL; goto error; } + + 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; + } + + list_lttng_events(kchan, *events); + + /* 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; + default: + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + /* This label does not try to unlock the session */ + goto init_setup_error; + } + } + + /* 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; + } + + /* + * 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; + } + } + + /* 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) { + ret = LTTCOMM_KERN_SESS_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; + } + } + } + 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; + } + + /* 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_DISABLE_ALL_EVENT: + { + DBG("Disabling all kernel event"); + + ret = cmd_disable_event_all(cmd_ctx->session, cmd_ctx->lsm->domain.type, + cmd_ctx->lsm->u.disable.channel_name); + break; + } + case LTTNG_ENABLE_CHANNEL: + { + 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: { - int size, i; - char *channel_name; - struct ltt_kernel_channel *kchan; - struct ltt_kernel_event *kevent; - struct lttng_event *event_list; - struct lttng_channel *chan; - - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - DBG("Enabling all kernel event"); - channel_name = cmd_ctx->lsm->u.enable.channel_name; - - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - kchan = trace_kernel_get_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(cmd_ctx->lsm->domain.type, channel_name); - if (chan == NULL) { - ret = LTTCOMM_FATAL; - goto error; - } - - ret = kernel_create_channel(cmd_ctx->session->kernel_session, - chan, cmd_ctx->session->kernel_session->trace_path); - if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; - goto error; - } - kchan = trace_kernel_get_channel_by_name(channel_name, - cmd_ctx->session->kernel_session); - if (kchan == NULL) { - ERR("Channel %s not found after creation. Internal error, giving up.", - channel_name); - ret = LTTCOMM_FATAL; - goto error; - } - } - - /* For each event in the kernel session */ - cds_list_for_each_entry(kevent, &kchan->events_list.head, list) { - DBG("Enabling kernel event %s for channel %s.", - kevent->event->name, channel_name); - ret = kernel_enable_event(kevent); - if (ret < 0) { - continue; - } - } - - size = kernel_list_events(kernel_tracer_fd, &event_list); - if (size < 0) { - ret = LTTCOMM_KERN_LIST_FAIL; - goto error; - } - - for (i = 0; i < size; i++) { - kevent = trace_kernel_get_event_by_name(event_list[i].name, kchan); - if (kevent == NULL) { - /* Default event type for enable all */ - event_list[i].type = LTTNG_EVENT_TRACEPOINT; - /* Enable each single tracepoint event */ - ret = kernel_create_event(&event_list[i], kchan); - if (ret < 0) { - /* Ignore error here and continue */ - } - } - } - - free(event_list); - - /* Quiescent wait after event enable */ - kernel_wait_quiescent(kernel_tracer_fd); - break; - default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; - goto error; - } - - ret = LTTCOMM_OK; + 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 = 0; + ssize_t nb_events; - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - DBG("Listing kernel events"); - nb_events = kernel_list_events(kernel_tracer_fd, &events); - if (nb_events < 0) { - ret = LTTCOMM_KERN_LIST_FAIL; - goto error; - } - break; - default: - /* TODO: Userspace listing */ - ret = LTTCOMM_NOT_IMPLEMENTED; - break; + nb_events = cmd_list_tracepoints(cmd_ctx->lsm->domain.type, &events); + if (nb_events < 0) { + ret = -nb_events; + goto error; } /* @@ -2169,358 +2686,144 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } case LTTNG_START_TRACE: { - struct ltt_kernel_channel *chan; - - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_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->kernel_session->trace_path); - if (ret < 0) { - ret = LTTCOMM_KERN_META_FAIL; - goto error; - } - } - - 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; - } - } - } - - /* 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; - } - } - - ret = start_kernel_trace(cmd_ctx->session->kernel_session); - if (ret < 0) { - ret = LTTCOMM_KERN_START_FAIL; - goto error; - } - - 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; - } - - /* Quiescent wait after starting trace */ - kernel_wait_quiescent(kernel_tracer_fd); - } - - /* TODO: Start all UST traces */ - - ret = LTTCOMM_OK; + ret = cmd_start_trace(cmd_ctx->session); break; } case LTTNG_STOP_TRACE: { - struct ltt_kernel_channel *chan; - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - /* Kernel tracer */ - if (cmd_ctx->session->kernel_session != NULL) { - DBG("Stop kernel tracing"); - - ret = kernel_metadata_flush_buffer(cmd_ctx->session->kernel_session->metadata_stream_fd); - if (ret < 0) { - ERR("Kernel metadata flush failed"); - } - - cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) { - ret = kernel_flush_buffer(chan); - if (ret < 0) { - ERR("Kernel flush buffer 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; - } - - /* Quiescent wait after stopping trace */ - kernel_wait_quiescent(kernel_tracer_fd); - } - - /* TODO : User-space tracer */ - - ret = LTTCOMM_OK; + ret = cmd_stop_trace(cmd_ctx->session); break; } case LTTNG_CREATE_SESSION: { - /* 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->session.path); - if (ret < 0) { - if (ret == -EEXIST) { - ret = LTTCOMM_EXIST_SESS; - } else { - ret = LTTCOMM_FATAL; - } - goto error; - } - - ret = LTTCOMM_OK; + ret = cmd_create_session(cmd_ctx->lsm->session.name, + cmd_ctx->lsm->session.path); break; } case LTTNG_DESTROY_SESSION: { - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - /* Clean kernel session teardown */ - teardown_kernel_session(cmd_ctx->session); - - ret = destroy_session(cmd_ctx->lsm->session.name); - if (ret < 0) { - ret = LTTCOMM_FATAL; - goto error; - } - - /* - * Must notify the kernel thread here to update it's pollfd in order to - * remove the channel(s)' fd just destroyed. - */ - ret = notify_kernel_pollfd(); - if (ret < 0) { - ret = LTTCOMM_FATAL; - goto error; - } - - ret = LTTCOMM_OK; + 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 = trace_kernel_get_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 (%zu 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: { - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - { - struct lttng_kernel_calibrate kcalibrate; - - kcalibrate.type = cmd_ctx->lsm->u.calibrate.type; - ret = kernel_calibrate(kernel_tracer_fd, &kcalibrate); - if (ret < 0) { - ret = LTTCOMM_KERN_ENABLE_FAIL; - goto error; - } - break; - } - default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; - goto error; - } - ret = LTTCOMM_OK; + ret = cmd_calibrate(cmd_ctx->lsm->domain.type, + &cmd_ctx->lsm->u.calibrate); break; } case LTTNG_REGISTER_CONSUMER: { - int sock; - - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - switch (cmd_ctx->lsm->domain.type) { - case LTTNG_DOMAIN_KERNEL: - { - /* Can't register a consumer if there is already one */ - if (cmd_ctx->session->kernel_session->consumer_fd != 0) { - ret = LTTCOMM_CONNECT_FAIL; - goto error; - } - - sock = lttcomm_connect_unix_sock(cmd_ctx->lsm->u.reg.path); - if (sock < 0) { - ret = LTTCOMM_CONNECT_FAIL; - goto error; - } - - cmd_ctx->session->kernel_session->consumer_fd = sock; - break; - } - default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; - goto error; - } - - ret = LTTCOMM_OK; + 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."); @@ -2528,13 +2831,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; } @@ -2544,9 +2847,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"); @@ -2555,15 +2859,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); @@ -2572,21 +2884,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; @@ -2594,9 +2921,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; @@ -2606,12 +2942,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 @@ -2621,15 +2962,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"); @@ -2643,15 +2987,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; } @@ -2702,7 +3042,8 @@ static int parse_args(int argc, char **argv) while (1) { int option_index = 0; - c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:E:C:Z", 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; } @@ -2798,7 +3139,8 @@ static int init_daemon_socket(void) } /* 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"); @@ -2811,8 +3153,8 @@ end: } /* - * Check if the global socket is available, and if a daemon is answering - * at the other side. 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(void) { @@ -2820,6 +3162,7 @@ static int check_existing_daemon(void) access(apps_unix_sock_path, F_OK) < 0) { return 0; } + /* Is there anybody out there ? */ if (lttng_session_daemon_alive()) { return -EEXIST; @@ -2924,11 +3267,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); @@ -2941,7 +3286,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; @@ -2949,7 +3295,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"); @@ -2963,8 +3310,8 @@ error: /* * Signal handler for the daemon * - * Simply stop all worker threads, leaving main() return gracefully - * after joining all threads and calling cleanup(). + * Simply stop all worker threads, leaving main() return gracefully after + * joining all threads and calling cleanup(). */ static void sighandler(int sig) { @@ -3089,6 +3436,12 @@ 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) { @@ -3108,6 +3461,12 @@ 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); @@ -3125,7 +3484,7 @@ int main(int argc, char **argv) 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 @@ -3179,10 +3538,13 @@ int main(int argc, char **argv) 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(); + + /* Set up max poll set size */ + lttng_poll_set_max_size(); /* Create thread to manage the client socket */ ret = pthread_create(&client_thread, NULL, @@ -3209,14 +3571,16 @@ int main(int argc, char **argv) } /* Create thread to manage application socket */ - ret = pthread_create(&apps_thread, NULL, thread_manage_apps, (void *) NULL); + ret = pthread_create(&apps_thread, NULL, + thread_manage_apps, (void *) NULL); if (ret != 0) { perror("pthread_create apps"); goto exit_apps; } /* Create kernel thread to manage kernel event */ - ret = pthread_create(&kernel_thread, NULL, thread_manage_kernel, (void *) NULL); + ret = pthread_create(&kernel_thread, NULL, + thread_manage_kernel, (void *) NULL); if (ret != 0) { perror("pthread_create kernel"); goto exit_kernel;