X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=1e2a0831dc80187b4b581e72ef97a037762a3fa4;hp=a3584938134f3cdfb25d865c2d80a67aabacc550;hb=7d8234d9e6f162ee642cdbec911f46c29b012c3d;hpb=58a97671d5fa65f93126798ded9e5306e3555186 diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index a35849381..1e2a0831d 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -3,8 +3,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * as published by the Free Software Foundation; only version 2 + * of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -28,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +41,7 @@ #include /* URCU list library (-lurcu) */ #include +#include "context.h" #include "liblttsessiondcomm.h" #include "ltt-sessiond.h" #include "lttngerr.h" @@ -47,16 +50,8 @@ #include "session.h" #include "traceable-app.h" #include "lttng-kconsumerd.h" -#include "libustctl.h" #include "utils.h" -/* - * TODO: - * teardown: signal SIGTERM handler -> write into pipe. Threads waits - * with epoll on pipe and on other pipes/sockets for commands. Main - * simply waits on pthread join. - */ - /* Const values */ const char default_home_dir[] = DEFAULT_HOME_DIR; const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP; @@ -65,7 +60,9 @@ const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE; /* Variables */ int opt_verbose; /* Not static for lttngerr.h */ +int opt_verbose_kconsumerd; /* Not static for lttngerr.h */ int opt_quiet; /* Not static for lttngerr.h */ + const char *progname; const char *opt_tracing_group; static int opt_sig_parent; @@ -73,6 +70,7 @@ static int opt_daemon; static int is_root; /* Set to 1 if the daemon is running as root */ static pid_t ppid; /* Parent PID for --sig-parent option */ static pid_t kconsumerd_pid; +static struct pollfd *kernel_pollfd; static char apps_unix_sock_path[PATH_MAX]; /* Global application Unix socket path */ static char client_unix_sock_path[PATH_MAX]; /* Global client Unix socket path */ @@ -85,20 +83,59 @@ static int apps_sock; static int kconsumerd_err_sock; static int kconsumerd_cmd_sock; static int kernel_tracer_fd; +static int kernel_poll_pipe[2]; + +/* + * Quit pipe for all threads. This permits a single cancellation point + * for all threads when receiving an event on the pipe. + */ +static int thread_quit_pipe[2]; /* Pthread, Mutexes and Semaphores */ static pthread_t kconsumerd_thread; static pthread_t apps_thread; static pthread_t client_thread; +static pthread_t kernel_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); + /* - * teardown_kernel_session + * Pointer initialized before thread creation. * - * Complete teardown of a kernel session. This free all data structure - * related to a kernel session and update counter. + * This points to the tracing session list containing the session count and a + * mutex lock. The lock MUST be taken if you iterate over the list. The lock + * MUST NOT be taken if you call a public function in session.c. + * + * The lock is nested inside the structure: session_list_ptr->lock. Please use + * lock_session_list and unlock_session_list for lock acquisition. + */ +static struct ltt_session_list *session_list_ptr; + +/* + * Init quit pipe. + * + * Return -1 on error or 0 if all pipes are created. + */ +static int init_thread_quit_pipe(void) +{ + int ret; + + ret = pipe2(thread_quit_pipe, O_CLOEXEC); + if (ret < 0) { + perror("thread quit pipe"); + goto error; + } + +error: + return ret; +} + +/* + * Complete teardown of a kernel session. This free all data structure related + * to a kernel session and update counter. */ static void teardown_kernel_session(struct ltt_session *session) { @@ -107,42 +144,34 @@ static void teardown_kernel_session(struct ltt_session *session) trace_destroy_kernel_session(session->kernel_session); /* Extra precaution */ session->kernel_session = NULL; - /* Decrement session count */ - session->kern_session_count--; } } +static void stop_threads(void) +{ + /* Stopping all threads */ + DBG("Terminating all threads"); + close(thread_quit_pipe[0]); + close(thread_quit_pipe[1]); +} + /* - * cleanup - * - * Cleanup the daemon on exit + * Cleanup the daemon */ -static void cleanup() +static void cleanup(void) { int ret; char *cmd; - struct ltt_session *sess; + struct ltt_session *sess, *stmp; DBG("Cleaning up"); /* */ - MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm", 27,1,31,27,0); - MSG("%c[%d;%dmMatthew, BEET driven development works!%c[%dm",27,1,33,27,0); + MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm%c[%d;%dm" + "Matthew, BEET driven development works!%c[%dm", + 27, 1, 31, 27, 0, 27, 1, 33, 27, 0); /* */ - /* Stopping all threads */ - DBG("Terminating all threads"); - pthread_cancel(client_thread); - pthread_cancel(apps_thread); - if (kconsumerd_pid != 0) { - pthread_cancel(kconsumerd_thread); - } - - DBG("Unlinking all unix socket"); - unlink(client_unix_sock_path); - unlink(apps_unix_sock_path); - unlink(kconsumerd_err_unix_sock_path); - DBG("Removing %s directory", LTTNG_RUNDIR); ret = asprintf(&cmd, "rm -rf " LTTNG_RUNDIR); if (ret < 0) { @@ -156,22 +185,31 @@ static void cleanup() } DBG("Cleaning up all session"); - /* Cleanup ALL session */ - cds_list_for_each_entry(sess, <t_session_list.head, list) { - teardown_kernel_session(sess); - // TODO complete session cleanup (including UST) + + /* Destroy session list mutex */ + if (session_list_ptr != NULL) { + pthread_mutex_destroy(&session_list_ptr->lock); + + /* Cleanup ALL session */ + cds_list_for_each_entry_safe(sess, stmp, &session_list_ptr->head, list) { + teardown_kernel_session(sess); + // TODO complete session cleanup (including UST) + } } + pthread_mutex_destroy(&kconsumerd_pid_mutex); + DBG("Closing kernel fd"); close(kernel_tracer_fd); + + DBG("Unloading kernel modules"); + modprobe_remove_kernel_modules(); } /* - * send_unix_sock + * Send data on a unix socket using the liblttsessiondcomm API. * - * Send data on a unix socket using the liblttsessiondcomm API. - * - * Return lttcomm error code. + * Return lttcomm error code. */ static int send_unix_sock(int sock, void *buf, size_t len) { @@ -184,43 +222,40 @@ static int send_unix_sock(int sock, void *buf, size_t len) } /* - * clean_command_ctx - * - * Free memory of a command context structure. + * Free memory of a command context structure. */ -static void clean_command_ctx(struct command_ctx *cmd_ctx) +static void clean_command_ctx(struct command_ctx **cmd_ctx) { - DBG("Clean command context structure %p", cmd_ctx); - if (cmd_ctx) { - if (cmd_ctx->llm) { - free(cmd_ctx->llm); + DBG("Clean command context structure"); + if (*cmd_ctx) { + if ((*cmd_ctx)->llm) { + free((*cmd_ctx)->llm); } - if (cmd_ctx->lsm) { - free(cmd_ctx->lsm); + if ((*cmd_ctx)->lsm) { + free((*cmd_ctx)->lsm); } - free(cmd_ctx); - cmd_ctx = NULL; + free(*cmd_ctx); + *cmd_ctx = NULL; } } /* - * send_kconsumerd_fds - * - * Send all stream fds of the kernel session to the consumer. + * Send all stream fds of kernel channel to the consumer. */ -static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) +static int send_kconsumerd_channel_fds(int sock, struct ltt_kernel_channel *channel) { int ret; size_t nb_fd; struct ltt_kernel_stream *stream; - struct ltt_kernel_channel *chan; struct lttcomm_kconsumerd_header lkh; struct lttcomm_kconsumerd_msg lkm; - nb_fd = session->stream_count_global; + DBG("Sending fds of channel %s to kernel consumer", channel->channel->name); + + nb_fd = channel->stream_count; /* Setup header */ - lkh.payload_size = (nb_fd + 1) * sizeof(struct lttcomm_kconsumerd_msg); + lkh.payload_size = nb_fd * sizeof(struct lttcomm_kconsumerd_msg); lkh.cmd_type = ADD_STREAM; DBG("Sending kconsumerd header"); @@ -231,25 +266,11 @@ static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) goto error; } - DBG("Sending metadata stream fd"); - - /* Send metadata stream fd first */ - lkm.fd = session->metadata_stream_fd; - lkm.state = ACTIVE_FD; - lkm.max_sb_size = session->metadata->conf->attr.subbuf_size; - strncpy(lkm.path_name, session->metadata->pathname, PATH_MAX); - - ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm)); - if (ret < 0) { - perror("send kconsumerd fd"); - goto error; - } - - cds_list_for_each_entry(chan, &session->channel_list.head, list) { - cds_list_for_each_entry(stream, &chan->stream_list.head, list) { + cds_list_for_each_entry(stream, &channel->stream_list.head, list) { + if (stream->fd != 0) { lkm.fd = stream->fd; lkm.state = stream->state; - lkm.max_sb_size = chan->channel->attr.subbuf_size; + lkm.max_sb_size = channel->channel->attr.subbuf_size; strncpy(lkm.path_name, stream->pathname, PATH_MAX); DBG("Sending fd %d to kconsumerd", lkm.fd); @@ -262,7 +283,7 @@ static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) } } - DBG("Kconsumerd fds sent"); + DBG("Kconsumerd channel fds sent"); return 0; @@ -271,41 +292,64 @@ error: } /* - * create_trace_dir - * - * Create the trace output directory. + * Send all stream fds of the kernel session to the consumer. */ -static int create_trace_dir(struct ltt_kernel_session *session) +static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session) { int ret; struct ltt_kernel_channel *chan; + struct lttcomm_kconsumerd_header lkh; + struct lttcomm_kconsumerd_msg lkm; + + /* Setup header */ + lkh.payload_size = sizeof(struct lttcomm_kconsumerd_msg); + lkh.cmd_type = ADD_STREAM; + + DBG("Sending kconsumerd header for metadata"); + + ret = lttcomm_send_unix_sock(sock, &lkh, sizeof(struct lttcomm_kconsumerd_header)); + if (ret < 0) { + perror("send kconsumerd header"); + goto error; + } + + DBG("Sending metadata stream fd"); + + if (session->metadata_stream_fd != 0) { + /* Send metadata stream fd first */ + lkm.fd = session->metadata_stream_fd; + lkm.state = ACTIVE_FD; + lkm.max_sb_size = session->metadata->conf->attr.subbuf_size; + strncpy(lkm.path_name, session->metadata->pathname, PATH_MAX); + + ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm)); + if (ret < 0) { + perror("send kconsumerd fd"); + goto error; + } + } - /* Create all channel directories */ cds_list_for_each_entry(chan, &session->channel_list.head, list) { - DBG("Creating trace directory at %s", chan->pathname); - ret = mkdir_recursive(chan->pathname, S_IRWXU | S_IRWXG ); + ret = send_kconsumerd_channel_fds(sock, chan); if (ret < 0) { - if (ret != EEXIST) { - ERR("Trace directory creation error"); - goto error; - } + goto error; } } + DBG("Kconsumerd fds (metadata and channel streams) sent"); + return 0; error: return ret; } +#ifdef DISABLED /* - * ust_connect_app - * - * Return a socket connected to the libust communication socket - * of the application identified by the pid. + * Return a socket connected to the libust communication socket of the + * application identified by the pid. * - * If the pid is not found in the traceable list, - * return -1 to indicate error. + * If the pid is not found in the traceable list, return -1 to indicate error. */ static int ust_connect_app(pid_t pid) { @@ -328,15 +372,14 @@ static int ust_connect_app(pid_t pid) return sock; } +#endif /* DISABLED */ /* - * notify_apps + * Notify apps by writing 42 to a named pipe using name. Every applications + * waiting for a ltt-sessiond will be notified and re-register automatically to + * the session daemon. * - * Notify apps by writing 42 to a named pipe using name. - * Every applications waiting for a ltt-sessiond will be notified - * and re-register automatically to the session daemon. - * - * Return open or write error value. + * Return open or write error value. */ static int notify_apps(const char *name) { @@ -362,13 +405,11 @@ error: } /* - * setup_lttng_msg - * - * Setup the outgoing data buffer for the response (llm) by allocating the - * right amount of memory and copying the original information from the lsm - * structure. + * Setup the outgoing data buffer for the response (llm) by allocating the + * right amount of memory and copying the original information from the lsm + * structure. * - * Return total size of the buffer pointed by buf. + * Return total size of the buffer pointed by buf. */ static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size) { @@ -385,7 +426,7 @@ static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size) /* Copy common data */ cmd_ctx->llm->cmd_type = cmd_ctx->lsm->cmd_type; - cmd_ctx->llm->pid = cmd_ctx->lsm->pid; + cmd_ctx->llm->pid = cmd_ctx->lsm->domain.attr.pid; cmd_ctx->llm->data_size = size; cmd_ctx->lttng_msg_size = sizeof(struct lttcomm_lttng_msg) + buf_size; @@ -397,15 +438,220 @@ error: } /* - * thread_manage_kconsumerd + * Update the kernel pollfd set of all channel fd available over all tracing + * session. Add the wakeup pipe at the end of the set. + */ +static int update_kernel_pollfd(void) +{ + 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; + struct ltt_session *session; + struct ltt_kernel_channel *channel; + + DBG("Updating kernel_pollfd"); + + /* Get the number of channel of all kernel session */ + lock_session_list(); + cds_list_for_each_entry(session, &session_list_ptr->head, list) { + lock_session(session); + if (session->kernel_session == NULL) { + unlock_session(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++; + } + unlock_session(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]; + + return nb_fd; + +error: + unlock_session_list(); + return -1; +} + +/* + * 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. + */ +static int update_kernel_stream(int fd) +{ + int ret = 0; + struct ltt_session *session; + struct ltt_kernel_channel *channel; + + DBG("Updating kernel streams for channel fd %d", fd); + + lock_session_list(); + cds_list_for_each_entry(session, &session_list_ptr->head, list) { + lock_session(session); + if (session->kernel_session == NULL) { + unlock_session(session); + continue; + } + 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; + } + /* + * Have we already sent fds to the consumer? If yes, it means that + * tracing is started so it is safe to send our updated stream fds. + */ + if (session->kernel_session->kconsumer_fds_sent == 1) { + ret = send_kconsumerd_channel_fds(kconsumerd_cmd_sock, channel); + if (ret < 0) { + goto end; + } + } + goto end; + } + } + unlock_session(session); + } + +end: + unlock_session_list(); + if (session) { + unlock_session(session); + } + return ret; +} + +/* + * This thread manage event coming from the kernel. * - * This thread manage the kconsumerd error sent - * back to the session daemon. + * Features supported in this thread: + * -) CPU Hotplug + */ +static void *thread_manage_kernel(void *data) +{ + int ret, i, nb_fd = 0; + char tmp; + int update_poll_flag = 1; + + DBG("Thread manage kernel started"); + + while (1) { + if (update_poll_flag == 1) { + nb_fd = update_kernel_pollfd(); + if (nb_fd < 0) { + goto error; + } + update_poll_flag = 0; + } + + DBG("Polling on %d fds", nb_fd); + + /* Poll infinite value of time */ + ret = poll(kernel_pollfd, nb_fd, -1); + if (ret < 0) { + perror("poll kernel thread"); + goto error; + } else if (ret == 0) { + /* Should not happen since timeout is infinite */ + continue; + } + + /* Thread quit pipe has been closed. Killing thread. */ + if (kernel_pollfd[nb_fd - 1].revents == POLLNVAL) { + goto error; + } + + DBG("Kernel poll event triggered"); + + /* + * 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; + } + + 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; + } + break; + } + } + } + +error: + DBG("Kernel thread dying"); + if (kernel_pollfd) { + free(kernel_pollfd); + } + + close(kernel_poll_pipe[0]); + close(kernel_poll_pipe[1]); + return NULL; +} + +/* + * This thread manage the kconsumerd error sent back to the session daemon. */ static void *thread_manage_kconsumerd(void *data) { - int sock, ret; + int sock = 0, ret; enum lttcomm_return_code code; + struct pollfd pollfd[2]; DBG("[thread] Manage kconsumerd started"); @@ -414,6 +660,28 @@ static void *thread_manage_kconsumerd(void *data) goto error; } + /* First fd is always the quit pipe */ + pollfd[0].fd = thread_quit_pipe[0]; + + /* Apps socket */ + pollfd[1].fd = kconsumerd_err_sock; + pollfd[1].events = POLLIN; + + /* Inifinite blocking call, waiting for transmission */ + ret = poll(pollfd, 2, -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; + } + sock = lttcomm_accept_unix_sock(kconsumerd_err_sock); if (sock < 0) { goto error; @@ -451,19 +719,31 @@ static void *thread_manage_kconsumerd(void *data) ERR("Kconsumerd return code : %s", lttcomm_get_readable_code(-code)); error: - kconsumerd_pid = 0; DBG("Kconsumerd thread dying"); + if (kconsumerd_err_sock) { + close(kconsumerd_err_sock); + } + if (kconsumerd_cmd_sock) { + close(kconsumerd_cmd_sock); + } + if (sock) { + close(sock); + } + + unlink(kconsumerd_err_unix_sock_path); + unlink(kconsumerd_cmd_unix_sock_path); + + kconsumerd_pid = 0; return NULL; } /* - * thread_manage_apps - * * This thread manage the application socket communication */ static void *thread_manage_apps(void *data) { - int sock, ret; + int sock = 0, ret; + struct pollfd pollfd[2]; /* TODO: Something more elegant is needed but fine for now */ /* FIXME: change all types to either uint8_t, uint32_t, uint64_t @@ -482,18 +762,41 @@ static void *thread_manage_apps(void *data) goto error; } + /* First fd is always the quit pipe */ + pollfd[0].fd = thread_quit_pipe[0]; + + /* Apps socket */ + pollfd[1].fd = apps_sock; + pollfd[1].events = POLLIN; + /* Notify all applications to register */ notify_apps(default_global_apps_pipe); while (1) { DBG("Accepting application registration"); - /* Blocking call, waiting for transmission */ + + /* Inifinite blocking call, waiting for transmission */ + ret = poll(pollfd, 2, -1); + if (ret < 0) { + perror("poll apps thread"); + goto error; + } + + /* Thread quit pipe has been closed. Killing thread. */ + if (pollfd[0].revents == POLLNVAL) { + goto error; + } else if (pollfd[1].revents == POLLERR) { + ERR("Apps socket poll error"); + goto error; + } + sock = lttcomm_accept_unix_sock(apps_sock); if (sock < 0) { goto error; } - /* Basic recv here to handle the very simple data + /* + * Basic recv here to handle the very simple data * that the libust send to register (reg_msg). */ ret = recv(sock, ®_msg, sizeof(reg_msg), 0); @@ -519,15 +822,21 @@ static void *thread_manage_apps(void *data) } error: + DBG("Apps thread dying"); + if (apps_sock) { + close(apps_sock); + } + if (sock) { + close(sock); + } + unlink(apps_unix_sock_path); return NULL; } /* - * spawn_kconsumerd_thread - * - * Start the thread_manage_kconsumerd. This must be done after a kconsumerd - * exec or it will fails. + * Start the thread_manage_kconsumerd. This must be done after a kconsumerd + * exec or it will fails. */ static int spawn_kconsumerd_thread(void) { @@ -557,21 +866,33 @@ error: return ret; } +static int join_kconsumerd_thread(void) +{ + void *status; + int ret; + + if (kconsumerd_pid != 0) { + ret = kill(kconsumerd_pid, SIGTERM); + if (ret) { + ERR("Error killing kconsumerd"); + return ret; + } + return pthread_join(kconsumerd_thread, &status); + } else { + return 0; + } +} + /* - * spawn_kconsumerd - * - * Fork and exec a kernel consumer daemon (kconsumerd). + * Fork and exec a kernel consumer daemon (kconsumerd). * - * NOTE: It is very important to fork a kconsumerd BEFORE opening any kernel - * file descriptor using the libkernelctl or kernel-ctl functions. So, a - * kernel consumer MUST only be spawned before creating a kernel session. - * - * Return pid if successful else -1. + * Return pid if successful else -1. */ static pid_t spawn_kconsumerd(void) { int ret; pid_t pid; + const char *verbosity; DBG("Spawning kconsumerd"); @@ -580,7 +901,12 @@ static pid_t spawn_kconsumerd(void) /* * Exec kconsumerd. */ - execlp("kconsumerd", "kconsumerd", "--verbose", NULL); + if (opt_verbose > 1 || opt_verbose_kconsumerd) { + verbosity = "--verbose"; + } else { + verbosity = "--quiet"; + } + execl(INSTALL_BIN_PATH "/ltt-kconsumerd", "ltt-kconsumerd", verbosity, NULL); if (errno != 0) { perror("kernel start consumer exec"); } @@ -599,9 +925,7 @@ error: } /* - * start_kconsumerd - * - * Spawn the kconsumerd daemon and session daemon thread. + * Spawn the kconsumerd daemon and session daemon thread. */ static int start_kconsumerd(void) { @@ -609,6 +933,7 @@ static int start_kconsumerd(void) pthread_mutex_lock(&kconsumerd_pid_mutex); if (kconsumerd_pid != 0) { + pthread_mutex_unlock(&kconsumerd_pid_mutex); goto end; } @@ -634,7 +959,6 @@ static int start_kconsumerd(void) } end: - pthread_mutex_unlock(&kconsumerd_pid_mutex); return 0; error: @@ -642,43 +966,191 @@ error: } /* - * init_kernel_tracer - * - * Setup necessary data for kernel tracer action. + * modprobe_kernel_modules */ -static void init_kernel_tracer(void) +static int modprobe_kernel_modules(void) { - /* Set the global kernel tracer fd */ - kernel_tracer_fd = open(DEFAULT_KERNEL_TRACER_PATH, O_RDWR); - if (kernel_tracer_fd < 0) { - WARN("No kernel tracer available"); - kernel_tracer_fd = 0; + int ret = 0, i; + char modprobe[256]; + + for (i = 0; i < ARRAY_SIZE(kernel_modules_list); i++) { + ret = snprintf(modprobe, sizeof(modprobe), + "/sbin/modprobe %s%s", + kernel_modules_list[i].required ? "" : "--quiet ", + kernel_modules_list[i].name); + if (ret < 0) { + perror("snprintf modprobe"); + goto error; + } + modprobe[sizeof(modprobe) - 1] = '\0'; + ret = system(modprobe); + if (ret == -1) { + ERR("Unable to launch modprobe for module %s", + kernel_modules_list[i].name); + } else if (kernel_modules_list[i].required + && WEXITSTATUS(ret) != 0) { + ERR("Unable to load module %s", + kernel_modules_list[i].name); + } else { + DBG("Modprobe successfully %s", + kernel_modules_list[i].name); + } } - DBG("Kernel tracer fd %d", kernel_tracer_fd); +error: + return ret; } /* - * start_kernel_trace - * - * Start tracing by creating trace directory and sending FDs to the kernel - * consumer. + * modprobe_remove_kernel_modules + * Remove modules in reverse load order. */ -static int start_kernel_trace(struct ltt_kernel_session *session) +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 + */ +static int mount_debugfs(char *path) { int ret; + char *type = "debugfs"; - /* Create trace directory */ - ret = create_trace_dir(session); + ret = mkdir_recursive(path, S_IRWXU | S_IRWXG); if (ret < 0) { - if (ret == -EEXIST) { - ret = LTTCOMM_KERN_DIR_EXIST; - } else { - ret = LTTCOMM_KERN_DIR_FAIL; + goto error; + } + + ret = mount(type, path, type, 0, NULL); + if (ret < 0) { + perror("mount debugfs"); + goto error; + } + + DBG("Mounted debugfs successfully at %s", path); + +error: + return ret; +} + +/* + * Setup necessary data for kernel tracer action. + */ +static void init_kernel_tracer(void) +{ + int ret; + char *proc_mounts = "/proc/mounts"; + char line[256]; + char *debugfs_path = NULL, *lttng_path; + FILE *fp; + + /* Detect debugfs */ + fp = fopen(proc_mounts, "r"); + if (fp == NULL) { + ERR("Unable to probe %s", proc_mounts); + goto error; + } + + while (fgets(line, sizeof(line), fp) != NULL) { + if (strstr(line, "debugfs") != NULL) { + /* Remove first string */ + strtok(line, " "); + /* Dup string here so we can reuse line later on */ + debugfs_path = strdup(strtok(NULL, " ")); + DBG("Got debugfs path : %s", debugfs_path); + break; + } + } + + fclose(fp); + + /* Mount debugfs if needded */ + if (debugfs_path == NULL) { + ret = asprintf(&debugfs_path, "/mnt/debugfs"); + if (ret < 0) { + perror("asprintf debugfs path"); + goto error; + } + ret = mount_debugfs(debugfs_path); + if (ret < 0) { goto error; } } + /* Modprobe lttng kernel modules */ + ret = modprobe_kernel_modules(); + if (ret < 0) { + goto error; + } + + /* Setup lttng kernel path */ + ret = asprintf(<tng_path, "%s/lttng", debugfs_path); + if (ret < 0) { + perror("asprintf lttng path"); + goto error; + } + + /* Open debugfs lttng */ + kernel_tracer_fd = open(lttng_path, O_RDWR); + if (kernel_tracer_fd < 0) { + DBG("Failed to open %s", lttng_path); + goto error; + } + + free(lttng_path); + free(debugfs_path); + DBG("Kernel tracer fd %d", kernel_tracer_fd); + return; + +error: + if (lttng_path) { + free(lttng_path); + } + if (debugfs_path) { + free(debugfs_path); + } + WARN("No kernel tracer available"); + kernel_tracer_fd = 0; + return; +} + +/* + * Start tracing by creating trace directory and sending FDs to the kernel + * consumer. + */ +static int start_kernel_trace(struct ltt_kernel_session *session) +{ + int ret = 0; + if (session->kconsumer_fds_sent == 0) { ret = send_kconsumerd_fds(kconsumerd_cmd_sock, session); if (ret < 0) { @@ -695,11 +1167,25 @@ error: } /* - * init_default_channel - * - * Allocate a channel structure and fill it. + * Notify kernel thread to update it's pollfd. + */ +static int notify_kernel_pollfd(void) +{ + 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"); + } + + return ret; +} + +/* + * Allocate a channel structure and fill it. */ -static struct lttng_channel *init_default_channel(void) +static struct lttng_channel *init_default_channel(char *name) { struct lttng_channel *chan; @@ -709,8 +1195,8 @@ static struct lttng_channel *init_default_channel(void) goto error; } - if (snprintf(chan->name, NAME_MAX, DEFAULT_CHANNEL_NAME) < 0) { - perror("snprintf defautl channel name"); + if (snprintf(chan->name, NAME_MAX, "%s", name) < 0) { + perror("snprintf channel name"); return NULL; } @@ -726,14 +1212,11 @@ error: } /* - * create_kernel_session - * - * Create a kernel tracer session then create the default channel. + * Create a kernel tracer session then create the default channel. */ static int create_kernel_session(struct ltt_session *session) { int ret; - struct lttng_channel *chan; DBG("Creating kernel session"); @@ -743,18 +1226,12 @@ static int create_kernel_session(struct ltt_session *session) goto error; } - chan = init_default_channel(); - if (chan == NULL) { - ret = LTTCOMM_FATAL; - goto error; - } - - DBG("Creating default kernel channel %s", DEFAULT_CHANNEL_NAME); - - ret = kernel_create_channel(session->kernel_session, chan, session->path); + ret = mkdir_recursive(session->path, S_IRWXU | S_IRWXG ); if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; - goto error; + if (ret != EEXIST) { + ERR("Trace directory creation error"); + goto error; + } } error: @@ -762,17 +1239,101 @@ error: } /* - * process_client_msg + * Using the session list, filled a lttng_session array to send back to the + * client for session listing. * - * Process the command requested by the lttng client within the command - * context structure. This function make sure that the return structure (llm) - * is set and ready for transmission before returning. + * The session list lock MUST be acquired before calling this function. Use + * lock_session_list() and unlock_session_list(). + */ +static void list_lttng_sessions(struct lttng_session *sessions) +{ + int i = 0; + struct ltt_session *session; + + DBG("Getting all available session"); + /* + * Iterate over session list and append data after the control struct in + * the buffer. + */ + cds_list_for_each_entry(session, &session_list_ptr->head, list) { + strncpy(sessions[i].path, session->path, PATH_MAX); + strncpy(sessions[i].name, session->name, NAME_MAX); + i++; + } +} + +/* + * Fill lttng_channel array of all channels. + */ +static void list_lttng_channels(struct ltt_session *session, + struct lttng_channel *channels) +{ + int i = 0; + struct ltt_kernel_channel *kchan; + + DBG("Listing channels for session %s", session->name); + + /* Kernel channels */ + if (session->kernel_session != NULL) { + cds_list_for_each_entry(kchan, &session->kernel_session->channel_list.head, list) { + /* Copy lttng_channel struct to array */ + memcpy(&channels[i], kchan->channel, sizeof(struct lttng_channel)); + channels[i].enabled = kchan->enabled; + i++; + } + } + + /* TODO: Missing UST listing */ +} + +/* + * Fill lttng_event array of all events in the channel. + */ +static void list_lttng_events(struct ltt_kernel_channel *kchan, + struct lttng_event *events) +{ + /* + * TODO: This is ONLY kernel. Need UST support. + */ + int i = 0; + struct ltt_kernel_event *event; + + DBG("Listing events for channel %s", kchan->channel->name); + + /* Kernel channels */ + cds_list_for_each_entry(event, &kchan->events_list.head , list) { + strncpy(events[i].name, event->event->name, LTTNG_SYMBOL_NAME_LEN); + events[i].enabled = event->enabled; + switch (event->event->instrumentation) { + case LTTNG_KERNEL_TRACEPOINT: + events[i].type = LTTNG_EVENT_TRACEPOINT; + break; + case LTTNG_KERNEL_KPROBE: + case LTTNG_KERNEL_KRETPROBE: + events[i].type = LTTNG_EVENT_PROBE; + memcpy(&events[i].attr.probe, &event->event->u.kprobe, + sizeof(struct lttng_kernel_kprobe)); + break; + case LTTNG_KERNEL_FUNCTION: + events[i].type = LTTNG_EVENT_FUNCTION; + memcpy(&events[i].attr.ftrace, &event->event->u.ftrace, + sizeof(struct lttng_kernel_function)); + break; + } + i++; + } +} + +/* + * Process the command requested by the lttng client within the command + * context structure. This function make sure that the return structure (llm) + * is set and ready for transmission before returning. * * Return any error encountered or 0 for success. */ static int process_client_msg(struct command_ctx *cmd_ctx) { - int ret; + int ret = LTTCOMM_OK; DBG("Processing client command %d", cmd_ctx->lsm->cmd_type); @@ -780,38 +1341,32 @@ static int process_client_msg(struct command_ctx *cmd_ctx) switch (cmd_ctx->lsm->cmd_type) { case LTTNG_CREATE_SESSION: case LTTNG_LIST_SESSIONS: - case LTTNG_LIST_EVENTS: - case LTTNG_KERNEL_LIST_EVENTS: - case LTTNG_LIST_TRACEABLE_APPS: + case LTTNG_LIST_TRACEPOINTS: + case LTTNG_CALIBRATE: break; default: - DBG("Getting session %s by name", cmd_ctx->lsm->session_name); - cmd_ctx->session = find_session_by_name(cmd_ctx->lsm->session_name); + DBG("Getting session %s by name", cmd_ctx->lsm->session.name); + cmd_ctx->session = find_session_by_name(cmd_ctx->lsm->session.name); if (cmd_ctx->session == NULL) { /* If session name not found */ - if (cmd_ctx->lsm->session_name != NULL) { + if (cmd_ctx->lsm->session.name != NULL) { ret = LTTCOMM_SESS_NOT_FOUND; } else { /* If no session name specified */ ret = LTTCOMM_SELECT_SESS; } goto error; + } else { + /* Acquire lock for the session */ + lock_session(cmd_ctx->session); } break; } /* - * Check kernel command for kernel session. + * Check domain type for specific "pre-action". */ - switch (cmd_ctx->lsm->cmd_type) { - case LTTNG_KERNEL_ADD_CONTEXT: - case LTTNG_KERNEL_CREATE_CHANNEL: - case LTTNG_KERNEL_DISABLE_ALL_EVENT: - case LTTNG_KERNEL_DISABLE_CHANNEL: - case LTTNG_KERNEL_DISABLE_EVENT: - case LTTNG_KERNEL_ENABLE_ALL_EVENT: - case LTTNG_KERNEL_ENABLE_CHANNEL: - case LTTNG_KERNEL_ENABLE_EVENT: - case LTTNG_KERNEL_LIST_EVENTS: + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: /* Kernel tracer check */ if (kernel_tracer_fd == 0) { init_kernel_tracer(); @@ -822,42 +1377,39 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } /* Need a session for kernel command */ - if (cmd_ctx->lsm->cmd_type != LTTNG_KERNEL_LIST_EVENTS && - cmd_ctx->session->kernel_session == NULL) { - - ret = create_kernel_session(cmd_ctx->session); - if (ret < 0) { - ret = LTTCOMM_KERN_SESS_FAIL; - goto error; - } - - /* Start the kernel consumer daemon */ - if (kconsumerd_pid == 0) { - ret = start_kconsumerd(); + switch (cmd_ctx->lsm->cmd_type) { + case LTTNG_CREATE_SESSION: + case LTTNG_LIST_SESSIONS: + case LTTNG_LIST_TRACEPOINTS: + case LTTNG_CALIBRATE: + break; + default: + if (cmd_ctx->session->kernel_session == NULL) { + ret = create_kernel_session(cmd_ctx->session); if (ret < 0) { + ret = LTTCOMM_KERN_SESS_FAIL; goto error; } - } - } - } - /* Connect to ust apps if available pid */ - if (cmd_ctx->lsm->pid > 0) { - /* Connect to app using ustctl API */ - cmd_ctx->ust_sock = ust_connect_app(cmd_ctx->lsm->pid); - if (cmd_ctx->ust_sock < 0) { - ret = LTTCOMM_NO_TRACEABLE; - goto error; + /* Start the kernel consumer daemon */ + if (kconsumerd_pid == 0) { + ret = start_kconsumerd(); + if (ret < 0) { + goto error; + } + } + } } + break; + default: + break; } /* Process by command type */ switch (cmd_ctx->lsm->cmd_type) { - case LTTNG_KERNEL_ADD_CONTEXT: + case LTTNG_ADD_CONTEXT: { - int found = 0, no_event = 0; - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *event; + struct lttng_kernel_context kctx; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -865,96 +1417,74 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - /* Check if event name is given */ - if (strlen(cmd_ctx->lsm->u.context.event_name) == 0) { - no_event = 1; - } - - if (strlen(cmd_ctx->lsm->u.context.channel_name) == 0) { - /* Go over all channels */ - DBG("Adding context to all channels"); - cds_list_for_each_entry(chan, - &cmd_ctx->session->kernel_session->channel_list.head, list) { - if (no_event) { - ret = kernel_add_channel_context(chan, - &cmd_ctx->lsm->u.context.ctx); - if (ret < 0) { - continue; - } - } else { - event = get_kernel_event_by_name(cmd_ctx->lsm->u.context.event_name, chan); - if (event != NULL) { - ret = kernel_add_event_context(event, - &cmd_ctx->lsm->u.context.ctx); - if (ret < 0) { - ret = LTTCOMM_KERN_CONTEXT_FAIL; - goto error; - } - found = 1; - break; - } - } - } - } else { - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.context.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + /* Create Kernel context */ + kctx.ctx = cmd_ctx->lsm->u.context.ctx.ctx; + kctx.u.perf_counter.type = cmd_ctx->lsm->u.context.ctx.u.perf_counter.type; + kctx.u.perf_counter.config = cmd_ctx->lsm->u.context.ctx.u.perf_counter.config; + strncpy(kctx.u.perf_counter.name, + cmd_ctx->lsm->u.context.ctx.u.perf_counter.name, + LTTNG_SYMBOL_NAME_LEN); + + /* Add kernel context to kernel tracer. See context.c */ + ret = add_kernel_context(cmd_ctx->session->kernel_session, &kctx, + cmd_ctx->lsm->u.context.event_name, + cmd_ctx->lsm->u.context.channel_name); + if (ret != LTTCOMM_OK) { goto error; } - - if (no_event) { - ret = kernel_add_channel_context(chan, - &cmd_ctx->lsm->u.context.ctx); - if (ret < 0) { - ret = LTTCOMM_KERN_CONTEXT_FAIL; - goto error; - } - } else { - event = get_kernel_event_by_name(cmd_ctx->lsm->u.context.event_name, chan); - if (event != NULL) { - ret = kernel_add_event_context(event, - &cmd_ctx->lsm->u.context.ctx); - if (ret < 0) { - ret = LTTCOMM_KERN_CONTEXT_FAIL; - goto error; - } - } - } - } - - if (!found && !no_event) { - ret = LTTCOMM_NO_EVENT; + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; goto error; } ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_CREATE_CHANNEL: + case LTTNG_DISABLE_CHANNEL: { + struct ltt_kernel_channel *kchan; + /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); if (ret < 0) { goto setup_error; } - /* Kernel tracer */ - DBG("Creating kernel channel"); - - ret = kernel_create_channel(cmd_ctx->session->kernel_session, - &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path); - if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + ret = LTTCOMM_KERN_CHAN_NOT_FOUND; + goto error; + } else if (kchan->enabled == 1) { + ret = kernel_disable_channel(kchan); + if (ret < 0) { + if (ret != EEXIST) { + ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL; + } + goto error; + } + } + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; goto error; } ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_DISABLE_CHANNEL: + case LTTNG_DISABLE_EVENT: { - struct ltt_kernel_channel *chan; + struct ltt_kernel_channel *kchan; + struct ltt_kernel_event *kevent; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -962,62 +1492,41 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } else if (chan->enabled == 1) { - ret = kernel_disable_channel(chan); - if (ret < 0) { - if (ret != EEXIST) { - ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL; - } + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + ret = LTTCOMM_KERN_CHAN_NOT_FOUND; goto error; } - } - - kernel_wait_quiescent(kernel_tracer_fd); - ret = LTTCOMM_OK; - break; - } - case LTTNG_KERNEL_DISABLE_EVENT: - { - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } + kevent = get_kernel_event_by_name(cmd_ctx->lsm->u.disable.name, kchan); + if (kevent != NULL) { + DBG("Disabling kernel event %s for channel %s.", kevent->event->name, + kchan->channel->name); + ret = kernel_disable_event(kevent); + if (ret < 0) { + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; + } + } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; goto error; } - ev = get_kernel_event_by_name(cmd_ctx->lsm->u.disable.name, chan); - if (ev != NULL) { - DBG("Disabling kernel event %s for channel %s.", - cmd_ctx->lsm->u.disable.name, cmd_ctx->lsm->u.disable.channel_name); - ret = kernel_disable_event(ev); - if (ret < 0) { - ret = LTTCOMM_KERN_ENABLE_FAIL; - goto error; - } - } - - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_DISABLE_ALL_EVENT: + case LTTNG_DISABLE_ALL_EVENT: { - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; + struct ltt_kernel_channel *kchan; + struct ltt_kernel_event *kevent; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1025,33 +1534,41 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - DBG("Disabling all enabled kernel events"); - - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + DBG("Disabling all enabled kernel events"); + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + ret = LTTCOMM_KERN_CHAN_NOT_FOUND; + goto error; + } - /* For each event in the kernel session */ - cds_list_for_each_entry(ev, &chan->events_list.head, list) { - DBG("Disabling kernel event %s for channel %s.", - ev->event->name, cmd_ctx->lsm->u.disable.channel_name); - ret = kernel_disable_event(ev); - if (ret < 0) { - continue; + /* For each event in the kernel session */ + cds_list_for_each_entry(kevent, &kchan->events_list.head, list) { + DBG("Disabling kernel event %s for channel %s.", + kevent->event->name, kchan->channel->name); + ret = kernel_disable_event(kevent); + if (ret < 0) { + continue; + } } + + /* Quiescent wait after event disable */ + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - /* Quiescent wait after event disable */ - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_ENABLE_CHANNEL: + case LTTNG_ENABLE_CHANNEL: { - struct ltt_kernel_channel *chan; + struct ltt_kernel_channel *kchan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1059,29 +1576,54 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } else if (chan->enabled == 0) { - ret = kernel_enable_channel(chan); - if (ret < 0) { - if (ret != EEXIST) { - ret = LTTCOMM_KERN_CHAN_ENABLE_FAIL; + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + /* Channel not found, creating it */ + DBG("Creating kernel channel"); + + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + + /* Notify kernel thread that there is a new channel */ + ret = notify_kernel_pollfd(); + if (ret < 0) { + ret = LTTCOMM_FATAL; + goto error; + } + } else if (kchan->enabled == 0) { + ret = kernel_enable_channel(kchan); + if (ret < 0) { + if (ret != EEXIST) { + ret = LTTCOMM_KERN_CHAN_ENABLE_FAIL; + } + goto error; } - goto error; } + + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_ENABLE_EVENT: + case LTTNG_ENABLE_EVENT: { - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; + 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); @@ -1089,40 +1631,69 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } + channel_name = cmd_ctx->lsm->u.enable.channel_name; - ev = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, chan); - if (ev == NULL) { - DBG("Creating kernel event %s for channel %s.", - cmd_ctx->lsm->u.enable.event.name, chan->channel->name); - ret = kernel_create_event(&cmd_ctx->lsm->u.enable.event, chan); - } else { - DBG("Enabling kernel event %s for channel %s.", - cmd_ctx->lsm->u.enable.event.name, chan->channel->name); - ret = kernel_enable_event(ev); - } + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + do { + kchan = get_kernel_channel_by_name(channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + DBG("Channel not found. Creating channel %s", channel_name); - if (ret < 0) { - ret = LTTCOMM_KERN_ENABLE_FAIL; + chan = init_default_channel(channel_name); + if (chan == NULL) { + ret = LTTCOMM_FATAL; + goto error; + } + + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + chan, cmd_ctx->session->path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + } + } while (kchan == NULL); + + kevent = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan); + if (kevent == NULL) { + DBG("Creating kernel event %s for channel %s.", + cmd_ctx->lsm->u.enable.event.name, channel_name); + ret = kernel_create_event(&cmd_ctx->lsm->u.enable.event, kchan); + } else { + DBG("Enabling kernel event %s for channel %s.", + kevent->event->name, channel_name); + ret = kernel_enable_event(kevent); + if (ret == -EEXIST) { + ret = LTTCOMM_KERN_EVENT_EXIST; + goto error; + } + } + + if (ret < 0) { + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto error; + } + + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; goto error; } - - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_ENABLE_ALL_EVENT: + case LTTNG_ENABLE_ALL_EVENT: { - int pos, size; - char *event_list, *event, *ptr; - struct ltt_kernel_channel *chan; - struct ltt_kernel_event *ev; - struct lttng_event ev_attr; + int size, i; + char *channel_name; + struct ltt_kernel_channel *kchan; + struct ltt_kernel_event *kevent; + struct lttng_event *event_list; + struct lttng_channel *chan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1132,81 +1703,109 @@ static int process_client_msg(struct command_ctx *cmd_ctx) DBG("Enabling all kernel event"); - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } + channel_name = cmd_ctx->lsm->u.enable.channel_name; - /* For each event in the kernel session */ - cds_list_for_each_entry(ev, &chan->events_list.head, list) { - DBG("Enabling kernel event %s for channel %s.", - ev->event->name, chan->channel->name); - ret = kernel_enable_event(ev); - if (ret < 0) { - continue; - } - } + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + do { + kchan = get_kernel_channel_by_name(channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + DBG("Channel not found. Creating channel %s", channel_name); - size = kernel_list_events(kernel_tracer_fd, &event_list); - if (size < 0) { - ret = LTTCOMM_KERN_LIST_FAIL; - goto error; - } + chan = init_default_channel(channel_name); + if (chan == NULL) { + ret = LTTCOMM_FATAL; + goto error; + } + + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + chan, cmd_ctx->session->path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + } + } while (kchan == NULL); - ptr = event_list; - while ((size = sscanf(ptr, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) { - ev = get_kernel_event_by_name(event, chan); - if (ev == NULL) { - strncpy(ev_attr.name, event, LTTNG_SYM_NAME_LEN); - /* Default event type for enable all */ - ev_attr.type = LTTNG_EVENT_TRACEPOINTS; - /* Enable each single tracepoint event */ - ret = kernel_create_event(&ev_attr, chan); + /* For each event in the kernel session */ + cds_list_for_each_entry(kevent, &kchan->events_list.head, list) { + DBG("Enabling kernel event %s for channel %s.", + kevent->event->name, channel_name); + ret = kernel_enable_event(kevent); if (ret < 0) { - /* Ignore error here and continue */ + continue; } } - /* Move pointer to the next line */ - ptr += pos + 1; - free(event); - } + size = kernel_list_events(kernel_tracer_fd, &event_list); + if (size < 0) { + ret = LTTCOMM_KERN_LIST_FAIL; + goto error; + } + + for (i = 0; i < size; i++) { + kevent = get_kernel_event_by_name(event_list[i].name, kchan); + if (kevent == NULL) { + /* Default event type for enable all */ + event_list[i].type = LTTNG_EVENT_TRACEPOINT; + /* Enable each single tracepoint event */ + ret = kernel_create_event(&event_list[i], kchan); + if (ret < 0) { + /* Ignore error here and continue */ + } + } + } + + free(event_list); - free(event_list); + /* Quiescent wait after event enable */ + kernel_wait_quiescent(kernel_tracer_fd); + break; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; + } - /* Quiescent wait after event enable */ - kernel_wait_quiescent(kernel_tracer_fd); ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_LIST_EVENTS: + case LTTNG_LIST_TRACEPOINTS: { - char *event_list; - ssize_t size = 0; - - DBG("Listing kernel events"); - - size = kernel_list_events(kernel_tracer_fd, &event_list); - if (size < 0) { - ret = LTTCOMM_KERN_LIST_FAIL; - goto error; + struct lttng_event *events; + ssize_t nb_events = 0; + + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + DBG("Listing kernel events"); + nb_events = kernel_list_events(kernel_tracer_fd, &events); + if (nb_events < 0) { + ret = LTTCOMM_KERN_LIST_FAIL; + goto error; + } + break; + default: + /* TODO: Userspace listing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + break; } /* * Setup lttng message with payload size set to the event list size in * bytes and then copy list into the llm payload. */ - ret = setup_lttng_msg(cmd_ctx, size); + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_event) * nb_events); if (ret < 0) { + free(events); goto setup_error; } /* Copy event list into message payload */ - memcpy(cmd_ctx->llm->payload, event_list, size); + memcpy(cmd_ctx->llm->payload, events, + sizeof(struct lttng_event) * nb_events); - free(event_list); + free(events); ret = LTTCOMM_OK; break; @@ -1246,7 +1845,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } /* For each channel */ - cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) { + cds_list_for_each_entry(chan, + &cmd_ctx->session->kernel_session->channel_list.head, list) { if (chan->stream_count == 0) { ret = kernel_open_channel_stream(chan); if (ret < 0) { @@ -1331,7 +1931,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - ret = create_session(cmd_ctx->lsm->session_name, cmd_ctx->lsm->path); + ret = create_session(cmd_ctx->lsm->session.name, cmd_ctx->lsm->session.path); if (ret < 0) { if (ret == -EEXIST) { ret = LTTCOMM_EXIST_SESS; @@ -1355,7 +1955,17 @@ static int process_client_msg(struct command_ctx *cmd_ctx) /* Clean kernel session teardown */ teardown_kernel_session(cmd_ctx->session); - ret = destroy_session(cmd_ctx->lsm->session_name); + ret = destroy_session(cmd_ctx->lsm->session.name); + if (ret < 0) { + ret = LTTCOMM_FATAL; + goto error; + } + + /* + * 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; @@ -1364,113 +1974,140 @@ static int process_client_msg(struct command_ctx *cmd_ctx) ret = LTTCOMM_OK; break; } - /* - case LTTNG_LIST_TRACES: + case LTTNG_LIST_DOMAINS: { - unsigned int trace_count; + size_t nb_dom = 0; - trace_count = get_trace_count_per_session(cmd_ctx->session); - if (trace_count == 0) { - ret = LTTCOMM_NO_TRACE; - goto error; + if (cmd_ctx->session->kernel_session != NULL) { + nb_dom++; } - ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_trace) * trace_count); + nb_dom += cmd_ctx->session->ust_trace_count; + + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_domain) * nb_dom); if (ret < 0) { goto setup_error; } - get_traces_per_session(cmd_ctx->session, - (struct lttng_trace *)(cmd_ctx->llm->payload)); + ((struct lttng_domain *)(cmd_ctx->llm->payload))[0].type = + LTTNG_DOMAIN_KERNEL; + /* TODO: User-space tracer domain support */ ret = LTTCOMM_OK; break; } - */ - /* - case UST_CREATE_TRACE: + case LTTNG_LIST_CHANNELS: { - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + /* + * TODO: Only kernel channels are listed here. UST listing + * is needed on lttng-ust 2.0 release. + */ + size_t nb_chan = 0; + if (cmd_ctx->session->kernel_session != NULL) { + nb_chan += cmd_ctx->session->kernel_session->channel_count; } - ret = ust_create_trace(cmd_ctx); + ret = setup_lttng_msg(cmd_ctx, + sizeof(struct lttng_channel) * nb_chan); if (ret < 0) { - goto error; + goto setup_error; } + + list_lttng_channels(cmd_ctx->session, + (struct lttng_channel *)(cmd_ctx->llm->payload)); + + ret = LTTCOMM_OK; break; } - */ - case LTTNG_LIST_TRACEABLE_APPS: + case LTTNG_LIST_EVENTS: { - unsigned int app_count; + /* + * 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; - app_count = get_app_count(); - DBG("Traceable application count : %d", app_count); - if (app_count == 0) { - ret = LTTCOMM_NO_APPS; - goto error; + if (cmd_ctx->session->kernel_session != NULL) { + kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.list.channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + ret = LTTCOMM_KERN_CHAN_NOT_FOUND; + goto error; + } + nb_event += kchan->event_count; } - ret = setup_lttng_msg(cmd_ctx, sizeof(pid_t) * app_count); + ret = setup_lttng_msg(cmd_ctx, + sizeof(struct lttng_event) * nb_event); if (ret < 0) { goto setup_error; } - get_app_list_pids((pid_t *)(cmd_ctx->llm->payload)); + DBG("Listing events (%ld events)", nb_event); + + list_lttng_events(kchan, + (struct lttng_event *)(cmd_ctx->llm->payload)); ret = LTTCOMM_OK; break; } - /* - case UST_START_TRACE: + case LTTNG_LIST_SESSIONS: { - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; + lock_session_list(); + + if (session_list_ptr->count == 0) { + ret = LTTCOMM_NO_SESSION; + unlock_session_list(); + goto error; } - ret = ust_start_trace(cmd_ctx); + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * + session_list_ptr->count); if (ret < 0) { + unlock_session_list(); goto setup_error; } + + /* Filled the session array */ + list_lttng_sessions((struct lttng_session *)(cmd_ctx->llm->payload)); + + unlock_session_list(); + + ret = LTTCOMM_OK; break; } - case UST_STOP_TRACE: + + case LTTNG_CALIBRATE: { + /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); if (ret < 0) { goto setup_error; } - ret = ust_stop_trace(cmd_ctx); - if (ret < 0) { - goto setup_error; - } - break; - } - */ - case LTTNG_LIST_SESSIONS: - { - unsigned int session_count; + switch (cmd_ctx->lsm->domain.type) { + case LTTNG_DOMAIN_KERNEL: + { + struct lttng_kernel_calibrate kcalibrate; - session_count = get_session_count(); - if (session_count == 0) { - ret = LTTCOMM_NO_SESSION; - goto error; + 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; } - - ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * session_count); - if (ret < 0) { - goto setup_error; + default: + /* TODO: Userspace tracing */ + ret = LTTCOMM_NOT_IMPLEMENTED; + goto error; } - - get_lttng_session((struct lttng_session *)(cmd_ctx->llm->payload)); - ret = LTTCOMM_OK; break; } + default: /* Undefined command */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1485,6 +2122,10 @@ static int process_client_msg(struct command_ctx *cmd_ctx) /* Set return code */ cmd_ctx->llm->ret_code = ret; + if (cmd_ctx->session) { + unlock_session(cmd_ctx->session); + } + return ret; error: @@ -1498,19 +2139,21 @@ error: cmd_ctx->llm->ret_code = ret; setup_error: + if (cmd_ctx->session) { + unlock_session(cmd_ctx->session); + } return ret; } /* - * thread_manage_clients - * - * This thread manage all clients request using the unix - * client socket for communication. + * This thread manage all clients request using the unix client socket for + * communication. */ static void *thread_manage_clients(void *data) { - int sock, ret; - struct command_ctx *cmd_ctx; + int sock = 0, ret; + struct command_ctx *cmd_ctx = NULL; + struct pollfd pollfd[2]; DBG("[thread] Manage client started"); @@ -1519,6 +2162,13 @@ static void *thread_manage_clients(void *data) goto error; } + /* First fd is always the quit pipe */ + pollfd[0].fd = thread_quit_pipe[0]; + + /* Apps socket */ + pollfd[1].fd = client_sock; + pollfd[1].events = POLLIN; + /* Notify parent pid that we are ready * to accept command for client side. */ @@ -1527,8 +2177,23 @@ static void *thread_manage_clients(void *data) } while (1) { - /* Blocking call, waiting for transmission */ DBG("Accepting client command ..."); + + /* Inifinite blocking call, waiting for transmission */ + ret = poll(pollfd, 2, -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; + } + sock = lttcomm_accept_unix_sock(client_sock); if (sock < 0) { goto error; @@ -1566,7 +2231,7 @@ static void *thread_manage_clients(void *data) /* TODO: Inform client somehow of the fatal error. At this point, * ret < 0 means that a malloc failed (ENOMEM). */ /* Error detected but still accept command */ - clean_command_ctx(cmd_ctx); + clean_command_ctx(&cmd_ctx); continue; } @@ -1577,13 +2242,24 @@ static void *thread_manage_clients(void *data) ERR("Failed to send data back to client"); } - clean_command_ctx(cmd_ctx); + clean_command_ctx(&cmd_ctx); /* End of transmission */ close(sock); } error: + DBG("Client thread dying"); + if (client_sock) { + close(client_sock); + } + if (sock) { + close(sock); + } + + unlink(client_unix_sock_path); + + clean_command_ctx(&cmd_ctx); return NULL; } @@ -1605,6 +2281,7 @@ static void usage(void) fprintf(stderr, " -S, --sig-parent Send SIGCHLD to parent pid to notify readiness.\n"); fprintf(stderr, " -q, --quiet No output at all.\n"); fprintf(stderr, " -v, --verbose Verbose mode. Activate DBG() macro.\n"); + fprintf(stderr, " --verbose-kconsumerd Verbose mode for kconsumerd. Activate DBG() macro.\n"); } /* @@ -1626,12 +2303,13 @@ static int parse_args(int argc, char **argv) { "version", 0, 0, 'V' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, + { "verbose-kconsumerd", 0, 0, 'Z' }, { NULL, 0, 0, 0 } }; while (1) { int option_index = 0; - c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:E:C:", long_options, &option_index); + c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:E:C:Z", long_options, &option_index); if (c == -1) { break; } @@ -1674,7 +2352,11 @@ static int parse_args(int argc, char **argv) opt_quiet = 1; break; case 'v': - opt_verbose = 1; + /* Verbose level can increase using multiple -v */ + opt_verbose += 1; + break; + case 'Z': + opt_verbose_kconsumerd += 1; break; default: /* Unknown option or other error. @@ -1687,13 +2369,11 @@ static int parse_args(int argc, char **argv) } /* - * init_daemon_socket - * - * Creates the two needed socket by the daemon. + * Creates the two needed socket by the daemon. * apps_sock - The communication socket for all UST apps. * client_sock - The communication of the cli tool (lttng). */ -static int init_daemon_socket() +static int init_daemon_socket(void) { int ret = 0; mode_t old_umask; @@ -1738,30 +2418,28 @@ end: } /* - * check_existing_daemon - * - * Check if the global socket is available. - * If yes, error is returned. + * Check if the global socket is available, and if a daemon is answering + * at the other side. If yes, error is returned. */ -static int check_existing_daemon() +static int check_existing_daemon(void) { int ret; - ret = access(client_unix_sock_path, F_OK); - if (ret == 0) { - ret = access(apps_unix_sock_path, F_OK); - } - - return ret; + if (access(client_unix_sock_path, F_OK) < 0 && + access(apps_unix_sock_path, F_OK) < 0) + return 0; + /* Is there anybody out there ? */ + if (lttng_session_daemon_alive()) + return -EEXIST; + else + return 0; } /* - * set_permissions + * Set the tracing group gid onto the client socket. * - * Set the tracing group gid onto the client socket. - * - * Race window between mkdir and chown is OK because we are going from - * less permissive (root.root) to more permissive (root.tracing). + * Race window between mkdir and chown is OK because we are going from more + * permissive (root.root) to les permissive (root.tracing). */ static int set_permissions(void) { @@ -1774,8 +2452,13 @@ static int set_permissions(void) (grp = getgrnam(default_tracing_group)); if (grp == NULL) { - ERR("Missing tracing group. Aborting execution.\n"); - ret = -1; + if (is_root) { + WARN("No tracing group detected"); + ret = 0; + } else { + ERR("Missing tracing group. Aborting execution."); + ret = -1; + } goto end; } @@ -1807,10 +2490,15 @@ end: } /* - * create_lttng_rundir - * - * Create the lttng run directory needed for all - * global sockets and pipe. + * Create the pipe used to wake up the kernel thread. + */ +static int create_kernel_poll_pipe(void) +{ + return pipe2(kernel_poll_pipe, O_CLOEXEC); +} + +/* + * Create the lttng run directory needed for all global sockets and pipe. */ static int create_lttng_rundir(void) { @@ -1831,10 +2519,8 @@ error: } /* - * set_kconsumerd_sockets - * - * Setup sockets and directory needed by the kconsumerd - * communication with the session daemon. + * Setup sockets and directory needed by the kconsumerd communication with the + * session daemon. */ static int set_kconsumerd_sockets(void) { @@ -1878,35 +2564,32 @@ error: } /* - * sighandler + * Signal handler for the daemon * - * Signal handler for the daemon + * Simply stop all worker threads, leaving main() return gracefully + * after joining all threads and calling cleanup(). */ static void sighandler(int sig) { switch (sig) { - case SIGPIPE: - DBG("SIGPIPE catched"); - return; - case SIGINT: - DBG("SIGINT catched"); - cleanup(); - break; - case SIGTERM: - DBG("SIGTERM catched"); - cleanup(); - break; - default: - break; + case SIGPIPE: + DBG("SIGPIPE catched"); + return; + case SIGINT: + DBG("SIGINT catched"); + stop_threads(); + break; + case SIGTERM: + DBG("SIGTERM catched"); + stop_threads(); + break; + default: + break; } - - exit(EXIT_SUCCESS); } /* - * set_signal_handler - * - * Setup signal handler for : + * Setup signal handler for : * SIGINT, SIGTERM, SIGPIPE */ static int set_signal_handler(void) @@ -1944,16 +2627,15 @@ static int set_signal_handler(void) } /* - * set_ulimit - * - * Set open files limit to unlimited. This daemon can open a large number of - * file descriptors in order to consumer multiple kernel traces. + * Set open files limit to unlimited. This daemon can open a large number of + * file descriptors in order to consumer multiple kernel traces. */ static void set_ulimit(void) { int ret; struct rlimit lim; + /* The kernel does not allowed an infinite limit for open files */ lim.rlim_cur = 65535; lim.rlim_max = 65535; @@ -1972,6 +2654,11 @@ int main(int argc, char **argv) void *status; const char *home_path; + /* Create thread quit pipe */ + if ((ret = init_thread_quit_pipe()) < 0) { + goto error; + } + /* Parse arguments */ progname = argv[0]; if ((ret = parse_args(argc, argv) < 0)) { @@ -1990,7 +2677,6 @@ int main(int argc, char **argv) /* Check if daemon is UID = 0 */ is_root = !getuid(); - /* Set all sockets path */ if (is_root) { ret = create_lttng_rundir(); if (ret < 0) { @@ -2006,22 +2692,12 @@ int main(int argc, char **argv) snprintf(client_unix_sock_path, PATH_MAX, DEFAULT_GLOBAL_CLIENT_UNIX_SOCK); } - - ret = set_kconsumerd_sockets(); - if (ret < 0) { - goto error; - } - - /* Setup kernel tracer */ - init_kernel_tracer(); - - /* Set ulimit for open files */ - set_ulimit(); } else { home_path = get_home_dir(); if (home_path == NULL) { - ERR("Can't get HOME directory for sockets creation.\n \ - Please specify --socket PATH."); + /* TODO: Add --socket PATH option */ + ERR("Can't get HOME directory for sockets creation."); + ret = -EPERM; goto error; } @@ -2040,29 +2716,51 @@ int main(int argc, char **argv) DBG("Client socket path %s", client_unix_sock_path); DBG("Application socket path %s", apps_unix_sock_path); - /* See if daemon already exist. If any of the two - * socket needed by the daemon are present, this test fails + /* + * See if daemon already exist. */ - if ((ret = check_existing_daemon()) == 0) { + if ((ret = check_existing_daemon()) < 0) { ERR("Already running daemon.\n"); - /* We do not goto error because we must not - * cleanup() because a daemon is already running. + /* + * We do not goto exit because we must not cleanup() + * because a daemon is already running. */ - exit(EXIT_FAILURE); + goto error; } - if (set_signal_handler() < 0) { - goto error; + /* After this point, we can safely call cleanup() so goto error is used */ + + /* + * These actions must be executed as root. We do that *after* setting up + * the sockets path because we MUST make the check for another daemon using + * those paths *before* trying to set the kernel consumer sockets and init + * kernel tracer. + */ + if (is_root) { + ret = set_kconsumerd_sockets(); + if (ret < 0) { + goto exit; + } + + /* Setup kernel tracer */ + init_kernel_tracer(); + + /* Set ulimit for open files */ + set_ulimit(); + } + + if ((ret = set_signal_handler()) < 0) { + goto exit; } /* Setup the needed unix socket */ - if (init_daemon_socket() < 0) { - goto error; + if ((ret = init_daemon_socket()) < 0) { + goto exit; } /* Set credentials to socket */ - if (is_root && (set_permissions() < 0)) { - goto error; + if (is_root && ((ret = set_permissions()) < 0)) { + goto exit; } /* Get parent pid if -S, --sig-parent is specified. */ @@ -2070,32 +2768,72 @@ int main(int argc, char **argv) ppid = getppid(); } - while (1) { - /* Create thread to manage the client socket */ - ret = pthread_create(&client_thread, NULL, thread_manage_clients, (void *) NULL); - if (ret != 0) { - perror("pthread_create"); - goto error; - } + /* Setup the kernel pipe for waking up the kernel thread */ + if ((ret = create_kernel_poll_pipe()) < 0) { + goto exit; + } - /* Create thread to manage application socket */ - ret = pthread_create(&apps_thread, NULL, thread_manage_apps, (void *) NULL); - if (ret != 0) { - perror("pthread_create"); - goto error; - } + /* + * Get session list pointer. This pointer MUST NOT be free(). + * This list is statically declared in session.c + */ + session_list_ptr = get_session_list(); - ret = pthread_join(client_thread, &status); - if (ret != 0) { - perror("pthread_join"); - goto error; - } + /* Create thread to manage the client socket */ + ret = pthread_create(&client_thread, NULL, thread_manage_clients, (void *) NULL); + if (ret != 0) { + perror("pthread_create"); + goto exit_client; } - cleanup(); - exit(EXIT_SUCCESS); + /* Create thread to manage application socket */ + ret = pthread_create(&apps_thread, NULL, thread_manage_apps, (void *) NULL); + if (ret != 0) { + perror("pthread_create"); + goto exit_apps; + } -error: + /* Create kernel thread to manage kernel event */ + ret = pthread_create(&kernel_thread, NULL, thread_manage_kernel, (void *) NULL); + if (ret != 0) { + perror("pthread_create"); + goto exit_kernel; + } + + ret = pthread_join(kernel_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ + } + +exit_kernel: + ret = pthread_join(apps_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ + } + +exit_apps: + ret = pthread_join(client_thread, &status); + if (ret != 0) { + perror("pthread_join"); + goto error; /* join error, exit without cleanup */ + } + + ret = join_kconsumerd_thread(); + if (ret != 0) { + perror("join_kconsumerd"); + goto error; /* join error, exit without cleanup */ + } + +exit_client: +exit: + /* + * cleanup() is called when no other thread is running. + */ cleanup(); + if (!ret) + exit(EXIT_SUCCESS); +error: exit(EXIT_FAILURE); }