#include <sys/wait.h>
#include <urcu/uatomic.h>
#include <unistd.h>
+#include <ctype.h>
#include <common/common.h>
#include <common/compat/socket.h>
#include <common/utils.h>
#include <common/daemonize.h>
#include <common/config/session-config.h>
+#include <common/dynamic-buffer.h>
+#include <lttng/event-internal.h>
#include "lttng-sessiond.h"
#include "buffer-registry.h"
#include "agent-thread.h"
#include "save.h"
#include "load-session-thread.h"
-#include "syscall.h"
+#include "notification-thread.h"
+#include "notification-thread-commands.h"
+#include "rotation-thread.h"
+#include "lttng-syscall.h"
#include "agent.h"
-
-#define CONSUMERD_FILE "lttng-consumerd"
+#include "ht-cleanup.h"
+#include "sessiond-config.h"
+#include "timer.h"
+#include "thread.h"
+#include "client.h"
+
+static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng-sessiond.8.h>
+#else
+NULL
+#endif
+;
const char *progname;
-static const char *tracing_group_name = DEFAULT_TRACING_GROUP;
-static int tracing_group_name_override;
-static char *opt_pidfile;
-static int opt_sig_parent;
-static int opt_verbose_consumer;
-static int opt_daemon, opt_background;
-static int opt_no_kernel;
-static char *opt_load_session_path;
-static pid_t ppid; /* Parent PID for --sig-parent option */
-static pid_t child_ppid; /* Internal parent PID use with daemonize. */
-static char *rundir;
static int lockfile_fd = -1;
/* Set to 1 when a SIGUSR1 signal is received. */
static int recv_child_signal;
-/*
- * Consumer daemon specific control data. Every value not initialized here is
- * set to 0 by the static definition.
- */
-static struct consumer_data kconsumer_data = {
- .type = LTTNG_CONSUMER_KERNEL,
- .err_unix_sock_path = DEFAULT_KCONSUMERD_ERR_SOCK_PATH,
- .cmd_unix_sock_path = DEFAULT_KCONSUMERD_CMD_SOCK_PATH,
- .err_sock = -1,
- .cmd_sock = -1,
- .pid_mutex = PTHREAD_MUTEX_INITIALIZER,
- .lock = PTHREAD_MUTEX_INITIALIZER,
- .cond = PTHREAD_COND_INITIALIZER,
- .cond_mutex = PTHREAD_MUTEX_INITIALIZER,
-};
-static struct consumer_data ustconsumer64_data = {
- .type = LTTNG_CONSUMER64_UST,
- .err_unix_sock_path = DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH,
- .cmd_unix_sock_path = DEFAULT_USTCONSUMERD64_CMD_SOCK_PATH,
- .err_sock = -1,
- .cmd_sock = -1,
- .pid_mutex = PTHREAD_MUTEX_INITIALIZER,
- .lock = PTHREAD_MUTEX_INITIALIZER,
- .cond = PTHREAD_COND_INITIALIZER,
- .cond_mutex = PTHREAD_MUTEX_INITIALIZER,
-};
-static struct consumer_data ustconsumer32_data = {
- .type = LTTNG_CONSUMER32_UST,
- .err_unix_sock_path = DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH,
- .cmd_unix_sock_path = DEFAULT_USTCONSUMERD32_CMD_SOCK_PATH,
- .err_sock = -1,
- .cmd_sock = -1,
- .pid_mutex = PTHREAD_MUTEX_INITIALIZER,
- .lock = PTHREAD_MUTEX_INITIALIZER,
- .cond = PTHREAD_COND_INITIALIZER,
- .cond_mutex = PTHREAD_MUTEX_INITIALIZER,
-};
-
/* Command line options */
static const struct option long_options[] = {
{ "client-sock", required_argument, 0, 'c' },
/* Shared between threads */
static int dispatch_thread_exit;
-/* Global application Unix socket path */
-static char apps_unix_sock_path[PATH_MAX];
-/* Global client Unix socket path */
-static char client_unix_sock_path[PATH_MAX];
-/* global wait shm path for UST */
-static char wait_shm_path[PATH_MAX];
-/* Global health check unix path */
-static char health_unix_sock_path[PATH_MAX];
-
-/* Sockets and FDs */
-static int client_sock = -1;
static int apps_sock = -1;
-int kernel_tracer_fd = -1;
-static int kernel_poll_pipe[2] = { -1, -1 };
-
-/*
- * 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] = { -1, -1 };
-static int ht_cleanup_quit_pipe[2] = { -1, -1 };
/*
* This pipe is used to inform the thread managing application communication
*/
static int apps_cmd_pipe[2] = { -1, -1 };
-int apps_cmd_notify_pipe[2] = { -1, -1 };
-
/* Pthread, Mutexes and Semaphores */
static pthread_t apps_thread;
static pthread_t apps_notify_thread;
static pthread_t reg_apps_thread;
-static pthread_t client_thread;
static pthread_t kernel_thread;
static pthread_t dispatch_thread;
-static pthread_t health_thread;
-static pthread_t ht_cleanup_thread;
static pthread_t agent_reg_thread;
static pthread_t load_session_thread;
*/
static struct ust_cmd_queue ust_cmd_queue;
-/*
- * Pointer initialized before thread creation.
- *
- * 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
- * session_lock_list and session_unlock_list for lock acquisition.
- */
-static struct ltt_session_list *session_list_ptr;
-
-int ust_consumerd64_fd = -1;
-int ust_consumerd32_fd = -1;
-
-static const char *consumerd32_bin = CONFIG_CONSUMERD32_BIN;
-static const char *consumerd64_bin = CONFIG_CONSUMERD64_BIN;
-static const char *consumerd32_libdir = CONFIG_CONSUMERD32_LIBDIR;
-static const char *consumerd64_libdir = CONFIG_CONSUMERD64_LIBDIR;
-static int consumerd32_bin_override;
-static int consumerd64_bin_override;
-static int consumerd32_libdir_override;
-static int consumerd64_libdir_override;
-
static const char *module_proc_lttng = "/proc/lttng";
-/*
- * Consumer daemon state which is changed when spawning it, killing it or in
- * case of a fatal error.
- */
-enum consumerd_state {
- CONSUMER_STARTED = 1,
- CONSUMER_STOPPED = 2,
- CONSUMER_ERROR = 3,
-};
-
-/*
- * This consumer daemon state is used to validate if a client command will be
- * able to reach the consumer. If not, the client is informed. For instance,
- * doing a "lttng start" when the consumer state is set to ERROR will return an
- * error to the client.
- *
- * The following example shows a possible race condition of this scheme:
- *
- * consumer thread error happens
- * client cmd arrives
- * client cmd checks state -> still OK
- * consumer thread exit, sets error
- * client cmd try to talk to consumer
- * ...
- *
- * However, since the consumer is a different daemon, we have no way of making
- * sure the command will reach it safely even with this state flag. This is why
- * we consider that up to the state validation during command processing, the
- * command is safe. After that, we can not guarantee the correctness of the
- * client request vis-a-vis the consumer.
- */
-static enum consumerd_state ust_consumerd_state;
-static enum consumerd_state kernel_consumerd_state;
-
-/*
- * Socket timeout for receiving and sending in seconds.
- */
-static int app_socket_timeout;
-
-/* Set in main() with the current page size. */
-long page_size;
-
-/* Application health monitoring */
-struct health_app *health_sessiond;
-
-/* Agent TCP port for registration. Used by the agent thread. */
-unsigned int agent_tcp_port = DEFAULT_AGENT_TCP_PORT;
-
-/* Am I root or not. */
-int is_root; /* Set to 1 if the daemon is running as root */
-
-const char * const config_section_name = "sessiond";
-
/* Load session thread information to operate. */
-struct load_session_thread_data *load_info;
-
-/* Global hash tables */
-struct lttng_ht *agent_apps_ht_by_sock = NULL;
-
-/*
- * Whether sessiond is ready for commands/health check requests.
- * NR_LTTNG_SESSIOND_READY must match the number of calls to
- * sessiond_notify_ready().
- */
-#define NR_LTTNG_SESSIOND_READY 3
-int lttng_sessiond_ready = NR_LTTNG_SESSIOND_READY;
-
-/* Notify parents that we are ready for cmd and health check */
-LTTNG_HIDDEN
-void sessiond_notify_ready(void)
-{
- if (uatomic_sub_return(<tng_sessiond_ready, 1) == 0) {
- /*
- * Notify parent pid that we are ready to accept command
- * for client side. This ppid is the one from the
- * external process that spawned us.
- */
- if (opt_sig_parent) {
- kill(ppid, SIGUSR1);
- }
-
- /*
- * Notify the parent of the fork() process that we are
- * ready.
- */
- if (opt_daemon || opt_background) {
- kill(child_ppid, SIGUSR1);
- }
- }
-}
-
-static
-void setup_consumerd_path(void)
-{
- const char *bin, *libdir;
-
- /*
- * Allow INSTALL_BIN_PATH to be used as a target path for the
- * native architecture size consumer if CONFIG_CONSUMER*_PATH
- * has not been defined.
- */
-#if (CAA_BITS_PER_LONG == 32)
- if (!consumerd32_bin[0]) {
- consumerd32_bin = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
- }
- if (!consumerd32_libdir[0]) {
- consumerd32_libdir = INSTALL_LIB_PATH;
- }
-#elif (CAA_BITS_PER_LONG == 64)
- if (!consumerd64_bin[0]) {
- consumerd64_bin = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
- }
- if (!consumerd64_libdir[0]) {
- consumerd64_libdir = INSTALL_LIB_PATH;
- }
-#else
-#error "Unknown bitness"
-#endif
-
- /*
- * runtime env. var. overrides the build default.
- */
- bin = lttng_secure_getenv("LTTNG_CONSUMERD32_BIN");
- if (bin) {
- consumerd32_bin = bin;
- }
- bin = lttng_secure_getenv("LTTNG_CONSUMERD64_BIN");
- if (bin) {
- consumerd64_bin = bin;
- }
- libdir = lttng_secure_getenv("LTTNG_CONSUMERD32_LIBDIR");
- if (libdir) {
- consumerd32_libdir = libdir;
- }
- libdir = lttng_secure_getenv("LTTNG_CONSUMERD64_LIBDIR");
- if (libdir) {
- consumerd64_libdir = libdir;
- }
-}
-
-static
-int __sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size,
- int *a_pipe)
-{
- int ret;
-
- assert(events);
-
- ret = lttng_poll_create(events, size, LTTNG_CLOEXEC);
- if (ret < 0) {
- goto error;
- }
-
- /* Add quit pipe */
- ret = lttng_poll_add(events, a_pipe[0], LPOLLIN | LPOLLERR);
- if (ret < 0) {
- goto error;
- }
-
- return 0;
-
-error:
- return ret;
-}
-
-/*
- * Create a poll set with O_CLOEXEC and add the thread quit pipe to the set.
- */
-int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size)
-{
- return __sessiond_set_thread_pollset(events, size, thread_quit_pipe);
-}
-
-/*
- * Create a poll set with O_CLOEXEC and add the thread quit pipe to the set.
- */
-int sessiond_set_ht_cleanup_thread_pollset(struct lttng_poll_event *events,
- size_t size)
-{
- return __sessiond_set_thread_pollset(events, size,
- ht_cleanup_quit_pipe);
-}
-
-static
-int __sessiond_check_thread_quit_pipe(int fd, uint32_t events, int a_pipe)
-{
- if (fd == a_pipe && (events & LPOLLIN)) {
- return 1;
- }
- return 0;
-}
-
-/*
- * Check if the thread quit pipe was triggered.
- *
- * Return 1 if it was triggered else 0;
- */
-int sessiond_check_thread_quit_pipe(int fd, uint32_t events)
-{
- return __sessiond_check_thread_quit_pipe(fd, events,
- thread_quit_pipe[0]);
-}
-
-/*
- * Check if the ht_cleanup thread quit pipe was triggered.
- *
- * Return 1 if it was triggered else 0;
- */
-int sessiond_check_ht_cleanup_quit(int fd, uint32_t events)
-{
- return __sessiond_check_thread_quit_pipe(fd, events,
- ht_cleanup_quit_pipe[0]);
-}
+static struct load_session_thread_data *load_info;
/*
- * Init thread quit pipe.
- *
- * Return -1 on error or 0 if all pipes are created.
+ * Section name to look for in the daemon configuration file.
*/
-static int __init_thread_quit_pipe(int *a_pipe)
-{
- int ret, i;
-
- ret = pipe(a_pipe);
- if (ret < 0) {
- PERROR("thread quit pipe");
- goto error;
- }
-
- for (i = 0; i < 2; i++) {
- ret = fcntl(a_pipe[i], F_SETFD, FD_CLOEXEC);
- if (ret < 0) {
- PERROR("fcntl");
- goto error;
- }
- }
+static const char * const config_section_name = "sessiond";
-error:
- return ret;
-}
-
-static int init_thread_quit_pipe(void)
-{
- return __init_thread_quit_pipe(thread_quit_pipe);
-}
-
-static int init_ht_cleanup_quit_pipe(void)
-{
- return __init_thread_quit_pipe(ht_cleanup_quit_pipe);
-}
+/* Am I root or not. Set to 1 if the daemon is running as root */
+static int is_root;
/*
* Stop all threads by closing the thread quit pipe.
/* Stopping all threads */
DBG("Terminating all threads");
- ret = notify_thread_pipe(thread_quit_pipe[1]);
+ ret = sessiond_notify_quit_pipe();
if (ret < 0) {
ERR("write error on thread quit pipe");
}
PERROR("UST consumerd64 cmd_sock close");
}
}
-}
-
-/*
- * Generate the full lock file path using the rundir.
- *
- * Return the snprintf() return value thus a negative value is an error.
- */
-static int generate_lock_file_path(char *path, size_t len)
-{
- int ret;
-
- assert(path);
- assert(rundir);
-
- /* Build lockfile path from rundir. */
- ret = snprintf(path, len, "%s/" DEFAULT_LTTNG_SESSIOND_LOCKFILE, rundir);
- if (ret < 0) {
- PERROR("snprintf lockfile path");
+ if (kconsumer_data.channel_monitor_pipe >= 0) {
+ ret = close(kconsumer_data.channel_monitor_pipe);
+ if (ret < 0) {
+ PERROR("kernel consumer channel monitor pipe close");
+ }
+ }
+ if (ustconsumer32_data.channel_monitor_pipe >= 0) {
+ ret = close(ustconsumer32_data.channel_monitor_pipe);
+ if (ret < 0) {
+ PERROR("UST consumerd32 channel monitor pipe close");
+ }
+ }
+ if (ustconsumer64_data.channel_monitor_pipe >= 0) {
+ ret = close(ustconsumer64_data.channel_monitor_pipe);
+ if (ret < 0) {
+ PERROR("UST consumerd64 channel monitor pipe close");
+ }
}
-
- return ret;
}
/*
ret = waitpid(consumer_data->pid, &status, 0);
if (ret == -1) {
PERROR("consumerd waitpid pid: %d", consumer_data->pid)
- }
- if (!WIFEXITED(status)) {
+ } else if (!WIFEXITED(status)) {
ERR("consumerd termination with error: %d",
WEXITSTATUS(ret));
}
static void sessiond_cleanup(void)
{
int ret;
- struct ltt_session *sess, *stmp;
- char path[PATH_MAX];
+ struct ltt_session_list *session_list = session_get_list();
DBG("Cleanup sessiond");
* Close the thread quit pipe. It has already done its job,
* since we are now called.
*/
- utils_close_pipe(thread_quit_pipe);
+ sessiond_close_quit_pipe();
- /*
- * If opt_pidfile is undefined, the default file will be wiped when
- * removing the rundir.
- */
- if (opt_pidfile) {
- ret = remove(opt_pidfile);
- if (ret < 0) {
- PERROR("remove pidfile %s", opt_pidfile);
- }
+ ret = remove(config.pid_file_path.value);
+ if (ret < 0) {
+ PERROR("remove pidfile %s", config.pid_file_path.value);
}
- DBG("Removing sessiond and consumerd content of directory %s", rundir);
+ DBG("Removing sessiond and consumerd content of directory %s",
+ config.rundir.value);
/* sessiond */
- snprintf(path, PATH_MAX,
- "%s/%s",
- rundir, DEFAULT_LTTNG_SESSIOND_PIDFILE);
- DBG("Removing %s", path);
- (void) unlink(path);
+ DBG("Removing %s", config.pid_file_path.value);
+ (void) unlink(config.pid_file_path.value);
- snprintf(path, PATH_MAX, "%s/%s", rundir,
- DEFAULT_LTTNG_SESSIOND_AGENTPORT_FILE);
- DBG("Removing %s", path);
- (void) unlink(path);
+ DBG("Removing %s", config.agent_port_file_path.value);
+ (void) unlink(config.agent_port_file_path.value);
/* kconsumerd */
- snprintf(path, PATH_MAX,
- DEFAULT_KCONSUMERD_ERR_SOCK_PATH,
- rundir);
- DBG("Removing %s", path);
- (void) unlink(path);
-
- snprintf(path, PATH_MAX,
- DEFAULT_KCONSUMERD_PATH,
- rundir);
- DBG("Removing directory %s", path);
- (void) rmdir(path);
+ DBG("Removing %s", kconsumer_data.err_unix_sock_path);
+ (void) unlink(kconsumer_data.err_unix_sock_path);
+
+ DBG("Removing directory %s", config.kconsumerd_path.value);
+ (void) rmdir(config.kconsumerd_path.value);
/* ust consumerd 32 */
- snprintf(path, PATH_MAX,
- DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH,
- rundir);
- DBG("Removing %s", path);
- (void) unlink(path);
-
- snprintf(path, PATH_MAX,
- DEFAULT_USTCONSUMERD32_PATH,
- rundir);
- DBG("Removing directory %s", path);
- (void) rmdir(path);
+ DBG("Removing %s", config.consumerd32_err_unix_sock_path.value);
+ (void) unlink(config.consumerd32_err_unix_sock_path.value);
+
+ DBG("Removing directory %s", config.consumerd32_path.value);
+ (void) rmdir(config.consumerd32_path.value);
/* ust consumerd 64 */
- snprintf(path, PATH_MAX,
- DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH,
- rundir);
- DBG("Removing %s", path);
- (void) unlink(path);
-
- snprintf(path, PATH_MAX,
- DEFAULT_USTCONSUMERD64_PATH,
- rundir);
- DBG("Removing directory %s", path);
- (void) rmdir(path);
-
- DBG("Cleaning up all sessions");
-
- /* 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) {
- cmd_destroy_session(sess, kernel_poll_pipe[1]);
- }
- }
+ DBG("Removing %s", config.consumerd64_err_unix_sock_path.value);
+ (void) unlink(config.consumerd64_err_unix_sock_path.value);
+
+ DBG("Removing directory %s", config.consumerd64_path.value);
+ (void) rmdir(config.consumerd64_path.value);
+
+ pthread_mutex_destroy(&session_list->lock);
wait_consumer(&kconsumer_data);
wait_consumer(&ustconsumer64_data);
ust_app_clean_list();
buffer_reg_destroy_registries();
- if (is_root && !opt_no_kernel) {
+ if (is_root && !config.no_kernel) {
DBG2("Closing kernel fd");
if (kernel_tracer_fd >= 0) {
ret = close(kernel_tracer_fd);
free(load_info);
}
- /*
- * Cleanup lock file by deleting it and finaly closing it which will
- * release the file system lock.
- */
- if (lockfile_fd >= 0) {
- char lockfile_path[PATH_MAX];
-
- ret = generate_lock_file_path(lockfile_path,
- sizeof(lockfile_path));
- if (ret > 0) {
- ret = remove(lockfile_path);
- if (ret < 0) {
- PERROR("remove lock file");
- }
- ret = close(lockfile_fd);
- if (ret < 0) {
- PERROR("close lock file");
- }
- }
- }
-
/*
* We do NOT rmdir rundir because there are other processes
* using it, for instance lttng-relayd, which can start in
* parallel with this teardown.
*/
-
- free(rundir);
}
/*
{
DBG("Cleaning up options");
- /*
- * If the override option is set, the pointer points to a *non* const
- * thus freeing it even though the variable type is set to const.
- */
- if (tracing_group_name_override) {
- free((void *) tracing_group_name);
- }
- if (consumerd32_bin_override) {
- free((void *) consumerd32_bin);
- }
- if (consumerd64_bin_override) {
- free((void *) consumerd64_bin);
- }
- if (consumerd32_libdir_override) {
- free((void *) consumerd32_libdir);
- }
- if (consumerd64_libdir_override) {
- free((void *) consumerd64_libdir);
- }
-
- free(opt_pidfile);
- free(opt_load_session_path);
- free(kmod_probes_list);
- free(kmod_extra_probes_list);
+ sessiond_config_fini(&config);
run_as_destroy_worker();
-
- /* <fun> */
- DBG("%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);
- /* </fun> */
-}
-
-/*
- * Send data on a unix socket using the liblttsessiondcomm API.
- *
- * Return lttcomm error code.
- */
-static int send_unix_sock(int sock, void *buf, size_t len)
-{
- /* Check valid length */
- if (len == 0) {
- return -1;
- }
-
- return lttcomm_send_unix_sock(sock, buf, len);
-}
-
-/*
- * Free memory of a command context structure.
- */
-static void clean_command_ctx(struct command_ctx **cmd_ctx)
-{
- DBG("Clean command context structure");
- if (*cmd_ctx) {
- if ((*cmd_ctx)->llm) {
- free((*cmd_ctx)->llm);
- }
- if ((*cmd_ctx)->lsm) {
- free((*cmd_ctx)->lsm);
- }
- free(*cmd_ctx);
- *cmd_ctx = NULL;
- }
}
/*
DBG("Notifying applications of session daemon state: %d", active);
/* See shm.c for this call implying mmap, shm and futex calls */
- wait_shm_mmap = shm_ust_get_mmap(wait_shm_path, is_root);
+ wait_shm_mmap = shm_ust_get_mmap(config.wait_shm_path.value, is_root);
if (wait_shm_mmap == NULL) {
goto error;
}
return -1;
}
-/*
- * 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 0 on success, negative value on error.
- */
-static int setup_lttng_msg(struct command_ctx *cmd_ctx,
- const void *payload_buf, size_t payload_len,
- const void *cmd_header_buf, size_t cmd_header_len)
-{
- int ret = 0;
- const size_t header_len = sizeof(struct lttcomm_lttng_msg);
- const size_t cmd_header_offset = header_len;
- const size_t payload_offset = cmd_header_offset + cmd_header_len;
- const size_t total_msg_size = header_len + cmd_header_len + payload_len;
-
- cmd_ctx->llm = zmalloc(total_msg_size);
-
- if (cmd_ctx->llm == NULL) {
- PERROR("zmalloc");
- ret = -ENOMEM;
- goto end;
- }
-
- /* Copy common data */
- cmd_ctx->llm->cmd_type = cmd_ctx->lsm->cmd_type;
- cmd_ctx->llm->pid = cmd_ctx->lsm->domain.attr.pid;
- cmd_ctx->llm->cmd_header_size = cmd_header_len;
- cmd_ctx->llm->data_size = payload_len;
- cmd_ctx->lttng_msg_size = total_msg_size;
-
- /* Copy command header */
- if (cmd_header_len) {
- memcpy(((uint8_t *) cmd_ctx->llm) + cmd_header_offset, cmd_header_buf,
- cmd_header_len);
- }
-
- /* Copy payload */
- if (payload_len) {
- memcpy(((uint8_t *) cmd_ctx->llm) + payload_offset, payload_buf,
- payload_len);
- }
-
-end:
- return ret;
-}
-
-/*
- * Version of setup_lttng_msg() without command header.
- */
-static int setup_lttng_msg_no_cmd_header(struct command_ctx *cmd_ctx,
- void *payload_buf, size_t payload_len)
-{
- return setup_lttng_msg(cmd_ctx, payload_buf, payload_len, NULL, 0);
-}
/*
* 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_poll(struct lttng_poll_event *events)
{
int ret;
- struct ltt_session *session;
struct ltt_kernel_channel *channel;
+ struct ltt_session *session;
+ const struct ltt_session_list *session_list = session_get_list();
DBG("Updating kernel poll set");
session_lock_list();
- cds_list_for_each_entry(session, &session_list_ptr->head, list) {
+ cds_list_for_each_entry(session, &session_list->head, list) {
+ if (!session_get(session)) {
+ continue;
+ }
session_lock(session);
if (session->kernel_session == NULL) {
session_unlock(session);
+ session_put(session);
continue;
}
ret = lttng_poll_add(events, channel->fd, LPOLLIN | LPOLLRDNORM);
if (ret < 0) {
session_unlock(session);
+ session_put(session);
goto error;
}
DBG("Channel fd %d added to kernel set", channel->fd);
*
* Useful for CPU hotplug feature.
*/
-static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
+static int update_kernel_stream(int fd)
{
int ret = 0;
struct ltt_session *session;
struct ltt_kernel_session *ksess;
struct ltt_kernel_channel *channel;
+ const struct ltt_session_list *session_list = session_get_list();
DBG("Updating kernel streams for channel fd %d", fd);
session_lock_list();
- cds_list_for_each_entry(session, &session_list_ptr->head, list) {
+ cds_list_for_each_entry(session, &session_list->head, list) {
+ if (!session_get(session)) {
+ continue;
+ }
session_lock(session);
if (session->kernel_session == NULL) {
session_unlock(session);
+ session_put(session);
continue;
}
ksess = session->kernel_session;
cds_lfht_for_each_entry(ksess->consumer->socks->ht,
&iter.iter, socket, node.node) {
pthread_mutex_lock(socket->lock);
- ret = kernel_consumer_send_channel_stream(socket,
+ ret = kernel_consumer_send_channel_streams(socket,
channel, ksess,
session->output_traces ? 1 : 0);
pthread_mutex_unlock(socket->lock);
rcu_read_unlock();
}
session_unlock(session);
+ session_put(session);
}
session_unlock_list();
return ret;
error:
session_unlock(session);
+ session_put(session);
session_unlock_list();
return ret;
}
static void update_ust_app(int app_sock)
{
struct ltt_session *sess, *stmp;
+ const struct ltt_session_list *session_list = session_get_list();
/* Consumer is in an ERROR state. Stop any application update. */
if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
}
/* For all tracing session(s) */
- cds_list_for_each_entry_safe(sess, stmp, &session_list_ptr->head, list) {
+ cds_list_for_each_entry_safe(sess, stmp, &session_list->head, list) {
struct ust_app *app;
+ if (!session_get(sess)) {
+ continue;
+ }
session_lock(sess);
if (!sess->ust_session) {
goto unlock_session;
rcu_read_unlock();
unlock_session:
session_unlock(sess);
+ session_put(sess);
}
}
* New CPU detected by the kernel. Adding kernel stream to
* kernel session and updating the kernel consumer
*/
- ret = update_kernel_stream(&kconsumer_data, pollfd);
+ ret = update_kernel_stream(pollfd);
if (ret < 0) {
continue;
}
/*
* This thread manage the consumer error sent back to the session daemon.
*/
-static void *thread_manage_consumer(void *data)
+void *thread_manage_consumer(void *data)
{
int sock = -1, i, ret, pollfd, err = -1, should_quit = 0;
uint32_t revents, nb_fd;
enum lttcomm_return_code code;
struct lttng_poll_event events;
struct consumer_data *consumer_data = data;
+ struct consumer_socket *cmd_socket_wrapper = NULL;
DBG("[thread] Manage consumer started");
}
health_code_update();
- if (code == LTTCOMM_CONSUMERD_COMMAND_SOCK_READY) {
- /* Connect both socket, command and metadata. */
- consumer_data->cmd_sock =
- lttcomm_connect_unix_sock(consumer_data->cmd_unix_sock_path);
- consumer_data->metadata_fd =
- lttcomm_connect_unix_sock(consumer_data->cmd_unix_sock_path);
- if (consumer_data->cmd_sock < 0
- || consumer_data->metadata_fd < 0) {
- PERROR("consumer connect cmd socket");
- /* On error, signal condition and quit. */
- signal_consumer_condition(consumer_data, -1);
- goto error;
- }
- consumer_data->metadata_sock.fd_ptr = &consumer_data->metadata_fd;
- /* Create metadata socket lock. */
- consumer_data->metadata_sock.lock = zmalloc(sizeof(pthread_mutex_t));
- if (consumer_data->metadata_sock.lock == NULL) {
- PERROR("zmalloc pthread mutex");
- ret = -1;
- goto error;
- }
- pthread_mutex_init(consumer_data->metadata_sock.lock, NULL);
-
- signal_consumer_condition(consumer_data, 1);
- DBG("Consumer command socket ready (fd: %d", consumer_data->cmd_sock);
- DBG("Consumer metadata socket ready (fd: %d)",
- consumer_data->metadata_fd);
- } else {
+ if (code != LTTCOMM_CONSUMERD_COMMAND_SOCK_READY) {
ERR("consumer error when waiting for SOCK_READY : %s",
lttcomm_get_readable_code(-code));
goto error;
}
- /* Remove the consumerd error sock since we've established a connexion */
- ret = lttng_poll_del(&events, consumer_data->err_sock);
- if (ret < 0) {
+ /* Connect both command and metadata sockets. */
+ consumer_data->cmd_sock =
+ lttcomm_connect_unix_sock(
+ consumer_data->cmd_unix_sock_path);
+ consumer_data->metadata_fd =
+ lttcomm_connect_unix_sock(
+ consumer_data->cmd_unix_sock_path);
+ if (consumer_data->cmd_sock < 0 || consumer_data->metadata_fd < 0) {
+ PERROR("consumer connect cmd socket");
+ /* On error, signal condition and quit. */
+ signal_consumer_condition(consumer_data, -1);
goto error;
}
- /* Add new accepted error socket. */
- ret = lttng_poll_add(&events, sock, LPOLLIN | LPOLLRDHUP);
- if (ret < 0) {
+ consumer_data->metadata_sock.fd_ptr = &consumer_data->metadata_fd;
+
+ /* Create metadata socket lock. */
+ consumer_data->metadata_sock.lock = zmalloc(sizeof(pthread_mutex_t));
+ if (consumer_data->metadata_sock.lock == NULL) {
+ PERROR("zmalloc pthread mutex");
+ goto error;
+ }
+ pthread_mutex_init(consumer_data->metadata_sock.lock, NULL);
+
+ DBG("Consumer command socket ready (fd: %d", consumer_data->cmd_sock);
+ DBG("Consumer metadata socket ready (fd: %d)",
+ consumer_data->metadata_fd);
+
+ /*
+ * Remove the consumerd error sock since we've established a connection.
+ */
+ ret = lttng_poll_del(&events, consumer_data->err_sock);
+ if (ret < 0) {
+ goto error;
+ }
+
+ /* Add new accepted error socket. */
+ ret = lttng_poll_add(&events, sock, LPOLLIN | LPOLLRDHUP);
+ if (ret < 0) {
goto error;
}
health_code_update();
+ /*
+ * Transfer the write-end of the channel monitoring and rotate pipe
+ * to the consumer by issuing a SET_CHANNEL_MONITOR_PIPE command.
+ */
+ cmd_socket_wrapper = consumer_allocate_socket(&consumer_data->cmd_sock);
+ if (!cmd_socket_wrapper) {
+ goto error;
+ }
+ cmd_socket_wrapper->lock = &consumer_data->lock;
+
+ ret = consumer_send_channel_monitor_pipe(cmd_socket_wrapper,
+ consumer_data->channel_monitor_pipe);
+ if (ret) {
+ goto error;
+ }
+
+ /* Discard the socket wrapper as it is no longer needed. */
+ consumer_destroy_socket(cmd_socket_wrapper);
+ cmd_socket_wrapper = NULL;
+
+ /* The thread is completely initialized, signal that it is ready. */
+ signal_consumer_condition(consumer_data, 1);
+
/* Infinite blocking call, waiting for transmission */
restart_poll:
while (1) {
free(consumer_data->metadata_sock.lock);
}
lttng_poll_clean(&events);
+
+ if (cmd_socket_wrapper) {
+ consumer_destroy_socket(cmd_socket_wrapper);
+ }
error_poll:
if (err) {
health_error();
}
/*
- * This thread manage application communication.
+ * This thread receives application command sockets (FDs) on the
+ * apps_cmd_pipe and waits (polls) on them until they are closed
+ * or an error occurs.
+ *
+ * At that point, it flushes the data (tracing and metadata) associated
+ * with this application and tears down ust app sessions and other
+ * associated data structures through ust_app_unregister().
+ *
+ * Note that this thread never sends commands to the applications
+ * through the command sockets; it merely listens for hang-ups
+ * and errors on those sockets and cleans-up as they occur.
*/
static void *thread_manage_apps(void *data)
{
.count = 0,
};
+ rcu_register_thread();
+
health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH);
if (testpoint(sessiond_thread_app_reg_dispatch)) {
DBG("[thread] Dispatch UST command started");
- while (!CMM_LOAD_SHARED(dispatch_thread_exit)) {
+ for (;;) {
health_code_update();
/* Atomically prepare the queue futex */
futex_nto1_prepare(&ust_cmd_queue.futex);
+ if (CMM_LOAD_SHARED(dispatch_thread_exit)) {
+ break;
+ }
+
do {
struct ust_app *app = NULL;
ust_cmd = NULL;
ERR("Health error occurred in %s", __func__);
}
health_unregister(health_sessiond);
+ rcu_unregister_thread();
return NULL;
}
* lttcomm_setsockopt_snd_timeout expect msec as
* parameter.
*/
- (void) lttcomm_setsockopt_rcv_timeout(sock,
- app_socket_timeout * 1000);
- (void) lttcomm_setsockopt_snd_timeout(sock,
- app_socket_timeout * 1000);
+ if (config.app_socket_timeout >= 0) {
+ (void) lttcomm_setsockopt_rcv_timeout(sock,
+ config.app_socket_timeout * 1000);
+ (void) lttcomm_setsockopt_snd_timeout(sock,
+ config.app_socket_timeout * 1000);
+ }
/*
* Set the CLOEXEC flag. Return code is useless because
}
lttng_fd_put(LTTNG_FD_APPS, 1);
}
- unlink(apps_unix_sock_path);
+ unlink(config.apps_unix_sock_path.value);
error_poll_add:
lttng_poll_clean(&events);
return NULL;
}
-/*
- * Start the thread_manage_consumer. This must be done after a lttng-consumerd
- * exec or it will fails.
- */
-static int spawn_consumer_thread(struct consumer_data *consumer_data)
-{
- int ret, clock_ret;
- struct timespec timeout;
-
- /* Make sure we set the readiness flag to 0 because we are NOT ready */
- consumer_data->consumer_thread_is_ready = 0;
-
- /* Setup pthread condition */
- ret = pthread_condattr_init(&consumer_data->condattr);
- if (ret) {
- errno = ret;
- PERROR("pthread_condattr_init consumer data");
- goto error;
- }
-
- /*
- * Set the monotonic clock in order to make sure we DO NOT jump in time
- * between the clock_gettime() call and the timedwait call. See bug #324
- * for a more details and how we noticed it.
- */
- ret = pthread_condattr_setclock(&consumer_data->condattr, CLOCK_MONOTONIC);
- if (ret) {
- errno = ret;
- PERROR("pthread_condattr_setclock consumer data");
- goto error;
- }
-
- ret = pthread_cond_init(&consumer_data->cond, &consumer_data->condattr);
- if (ret) {
- errno = ret;
- PERROR("pthread_cond_init consumer data");
- goto error;
- }
-
- ret = pthread_create(&consumer_data->thread, NULL, thread_manage_consumer,
- consumer_data);
- if (ret) {
- errno = ret;
- PERROR("pthread_create consumer");
- ret = -1;
- goto error;
- }
-
- /* We are about to wait on a pthread condition */
- pthread_mutex_lock(&consumer_data->cond_mutex);
-
- /* Get time for sem_timedwait absolute timeout */
- clock_ret = clock_gettime(CLOCK_MONOTONIC, &timeout);
- /*
- * Set the timeout for the condition timed wait even if the clock gettime
- * call fails since we might loop on that call and we want to avoid to
- * increment the timeout too many times.
- */
- timeout.tv_sec += DEFAULT_SEM_WAIT_TIMEOUT;
-
- /*
- * The following loop COULD be skipped in some conditions so this is why we
- * set ret to 0 in order to make sure at least one round of the loop is
- * done.
- */
- ret = 0;
-
- /*
- * Loop until the condition is reached or when a timeout is reached. Note
- * that the pthread_cond_timedwait(P) man page specifies that EINTR can NOT
- * be returned but the pthread_cond(3), from the glibc-doc, says that it is
- * possible. This loop does not take any chances and works with both of
- * them.
- */
- while (!consumer_data->consumer_thread_is_ready && ret != ETIMEDOUT) {
- if (clock_ret < 0) {
- PERROR("clock_gettime spawn consumer");
- /* Infinite wait for the consumerd thread to be ready */
- ret = pthread_cond_wait(&consumer_data->cond,
- &consumer_data->cond_mutex);
- } else {
- ret = pthread_cond_timedwait(&consumer_data->cond,
- &consumer_data->cond_mutex, &timeout);
- }
- }
-
- /* Release the pthread condition */
- pthread_mutex_unlock(&consumer_data->cond_mutex);
-
- if (ret != 0) {
- errno = ret;
- if (ret == ETIMEDOUT) {
- int pth_ret;
-
- /*
- * Call has timed out so we kill the kconsumerd_thread and return
- * an error.
- */
- ERR("Condition timed out. The consumer thread was never ready."
- " Killing it");
- pth_ret = pthread_cancel(consumer_data->thread);
- if (pth_ret < 0) {
- PERROR("pthread_cancel consumer thread");
- }
- } else {
- PERROR("pthread_cond_wait failed consumer thread");
- }
- /* Caller is expecting a negative value on failure. */
- ret = -1;
- goto error;
- }
-
- pthread_mutex_lock(&consumer_data->pid_mutex);
- if (consumer_data->pid == 0) {
- ERR("Consumerd did not start");
- pthread_mutex_unlock(&consumer_data->pid_mutex);
- goto error;
- }
- pthread_mutex_unlock(&consumer_data->pid_mutex);
-
- return 0;
-
-error:
- return ret;
-}
-
-/*
- * Join consumer thread
- */
-static int join_consumer_thread(struct consumer_data *consumer_data)
-{
- void *status;
-
- /* Consumer pid must be a real one. */
- if (consumer_data->pid > 0) {
- int ret;
- ret = kill(consumer_data->pid, SIGTERM);
- if (ret) {
- PERROR("Error killing consumer daemon");
- return ret;
- }
- return pthread_join(consumer_data->thread, &status);
- } else {
- return 0;
- }
-}
-
-/*
- * Fork and exec a consumer daemon (consumerd).
- *
- * Return pid if successful else -1.
- */
-static pid_t spawn_consumerd(struct consumer_data *consumer_data)
-{
- int ret;
- pid_t pid;
- const char *consumer_to_use;
- const char *verbosity;
- struct stat st;
-
- DBG("Spawning consumerd");
-
- pid = fork();
- if (pid == 0) {
- /*
- * Exec consumerd.
- */
- if (opt_verbose_consumer) {
- verbosity = "--verbose";
- } else if (lttng_opt_quiet) {
- verbosity = "--quiet";
- } else {
- verbosity = "";
- }
-
- switch (consumer_data->type) {
- case LTTNG_CONSUMER_KERNEL:
- /*
- * Find out which consumerd to execute. We will first try the
- * 64-bit path, then the sessiond's installation directory, and
- * fallback on the 32-bit one,
- */
- DBG3("Looking for a kernel consumer at these locations:");
- DBG3(" 1) %s", consumerd64_bin);
- DBG3(" 2) %s/%s", INSTALL_BIN_PATH, CONSUMERD_FILE);
- DBG3(" 3) %s", consumerd32_bin);
- if (stat(consumerd64_bin, &st) == 0) {
- DBG3("Found location #1");
- consumer_to_use = consumerd64_bin;
- } else if (stat(INSTALL_BIN_PATH "/" CONSUMERD_FILE, &st) == 0) {
- DBG3("Found location #2");
- consumer_to_use = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
- } else if (stat(consumerd32_bin, &st) == 0) {
- DBG3("Found location #3");
- consumer_to_use = consumerd32_bin;
- } else {
- DBG("Could not find any valid consumerd executable");
- ret = -EINVAL;
- break;
- }
- DBG("Using kernel consumer at: %s", consumer_to_use);
- ret = execl(consumer_to_use,
- "lttng-consumerd", verbosity, "-k",
- "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
- "--consumerd-err-sock", consumer_data->err_unix_sock_path,
- "--group", tracing_group_name,
- NULL);
- break;
- case LTTNG_CONSUMER64_UST:
- {
- char *tmpnew = NULL;
-
- if (consumerd64_libdir[0] != '\0') {
- char *tmp;
- size_t tmplen;
-
- tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
- if (!tmp) {
- tmp = "";
- }
- tmplen = strlen("LD_LIBRARY_PATH=")
- + strlen(consumerd64_libdir) + 1 /* : */ + strlen(tmp);
- tmpnew = zmalloc(tmplen + 1 /* \0 */);
- if (!tmpnew) {
- ret = -ENOMEM;
- goto error;
- }
- strcpy(tmpnew, "LD_LIBRARY_PATH=");
- strcat(tmpnew, consumerd64_libdir);
- if (tmp[0] != '\0') {
- strcat(tmpnew, ":");
- strcat(tmpnew, tmp);
- }
- ret = putenv(tmpnew);
- if (ret) {
- ret = -errno;
- free(tmpnew);
- goto error;
- }
- }
- DBG("Using 64-bit UST consumer at: %s", consumerd64_bin);
- ret = execl(consumerd64_bin, "lttng-consumerd", verbosity, "-u",
- "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
- "--consumerd-err-sock", consumer_data->err_unix_sock_path,
- "--group", tracing_group_name,
- NULL);
- if (consumerd64_libdir[0] != '\0') {
- free(tmpnew);
- }
- break;
- }
- case LTTNG_CONSUMER32_UST:
- {
- char *tmpnew = NULL;
-
- if (consumerd32_libdir[0] != '\0') {
- char *tmp;
- size_t tmplen;
-
- tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
- if (!tmp) {
- tmp = "";
- }
- tmplen = strlen("LD_LIBRARY_PATH=")
- + strlen(consumerd32_libdir) + 1 /* : */ + strlen(tmp);
- tmpnew = zmalloc(tmplen + 1 /* \0 */);
- if (!tmpnew) {
- ret = -ENOMEM;
- goto error;
- }
- strcpy(tmpnew, "LD_LIBRARY_PATH=");
- strcat(tmpnew, consumerd32_libdir);
- if (tmp[0] != '\0') {
- strcat(tmpnew, ":");
- strcat(tmpnew, tmp);
- }
- ret = putenv(tmpnew);
- if (ret) {
- ret = -errno;
- free(tmpnew);
- goto error;
- }
- }
- DBG("Using 32-bit UST consumer at: %s", consumerd32_bin);
- ret = execl(consumerd32_bin, "lttng-consumerd", verbosity, "-u",
- "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
- "--consumerd-err-sock", consumer_data->err_unix_sock_path,
- "--group", tracing_group_name,
- NULL);
- if (consumerd32_libdir[0] != '\0') {
- free(tmpnew);
- }
- break;
- }
- default:
- PERROR("unknown consumer type");
- exit(EXIT_FAILURE);
- }
- if (errno != 0) {
- PERROR("Consumer execl()");
- }
- /* Reaching this point, we got a failure on our execl(). */
- exit(EXIT_FAILURE);
- } else if (pid > 0) {
- ret = pid;
- } else {
- PERROR("start consumer fork");
- ret = -errno;
- }
-error:
- return ret;
-}
-
-/*
- * Spawn the consumerd daemon and session daemon thread.
- */
-static int start_consumerd(struct consumer_data *consumer_data)
-{
- int ret;
-
- /*
- * Set the listen() state on the socket since there is a possible race
- * between the exec() of the consumer daemon and this call if place in the
- * consumer thread. See bug #366 for more details.
- */
- ret = lttcomm_listen_unix_sock(consumer_data->err_sock);
- if (ret < 0) {
- goto error;
- }
-
- pthread_mutex_lock(&consumer_data->pid_mutex);
- if (consumer_data->pid != 0) {
- pthread_mutex_unlock(&consumer_data->pid_mutex);
- goto end;
- }
-
- ret = spawn_consumerd(consumer_data);
- if (ret < 0) {
- ERR("Spawning consumerd failed");
- pthread_mutex_unlock(&consumer_data->pid_mutex);
- goto error;
- }
-
- /* Setting up the consumer_data pid */
- consumer_data->pid = ret;
- DBG2("Consumer pid %d", consumer_data->pid);
- pthread_mutex_unlock(&consumer_data->pid_mutex);
-
- DBG2("Spawning consumer control thread");
- ret = spawn_consumer_thread(consumer_data);
- if (ret < 0) {
- ERR("Fatal error spawning consumer control thread");
- goto error;
- }
-
-end:
- return 0;
-
-error:
- /* Cleanup already created sockets on error. */
- if (consumer_data->err_sock >= 0) {
- int err;
-
- err = close(consumer_data->err_sock);
- if (err < 0) {
- PERROR("close consumer data error socket");
- }
- }
- return ret;
-}
-
/*
* Setup necessary data for kernel tracer action.
*/
kernel_tracer_fd = open(module_proc_lttng, O_RDWR);
if (kernel_tracer_fd < 0) {
DBG("Failed to open %s", module_proc_lttng);
- ret = -1;
goto error_open;
}
/* Validate kernel version */
- ret = kernel_validate_version(kernel_tracer_fd);
+ ret = kernel_validate_version(kernel_tracer_fd, &kernel_tracer_version,
+ &kernel_tracer_abi_version);
if (ret < 0) {
goto error_version;
}
goto error_modules;
}
+ ret = kernel_supports_ring_buffer_snapshot_sample_positions(
+ kernel_tracer_fd);
+ if (ret < 0) {
+ goto error_modules;
+ }
+
+ if (ret < 1) {
+ WARN("Kernel tracer does not support buffer monitoring. "
+ "The monitoring timer of channels in the kernel domain "
+ "will be set to 0 (disabled).");
+ }
+
DBG("Kernel tracer fd %d", kernel_tracer_fd);
return 0;
}
}
-
-/*
- * Copy consumer output from the tracing session to the domain session. The
- * function also applies the right modification on a per domain basis for the
- * trace files destination directory.
- *
- * Should *NOT* be called with RCU read-side lock held.
- */
-static int copy_session_consumer(int domain, struct ltt_session *session)
+static int string_match(const char *str1, const char *str2)
{
- int ret;
- const char *dir_name;
- struct consumer_output *consumer;
-
- assert(session);
- assert(session->consumer);
-
- switch (domain) {
- case LTTNG_DOMAIN_KERNEL:
- DBG3("Copying tracing session consumer output in kernel session");
- /*
- * XXX: We should audit the session creation and what this function
- * does "extra" in order to avoid a destroy since this function is used
- * in the domain session creation (kernel and ust) only. Same for UST
- * domain.
- */
- if (session->kernel_session->consumer) {
- consumer_output_put(session->kernel_session->consumer);
- }
- session->kernel_session->consumer =
- consumer_copy_output(session->consumer);
- /* Ease our life a bit for the next part */
- consumer = session->kernel_session->consumer;
- dir_name = DEFAULT_KERNEL_TRACE_DIR;
- break;
- case LTTNG_DOMAIN_JUL:
- case LTTNG_DOMAIN_LOG4J:
- case LTTNG_DOMAIN_PYTHON:
- case LTTNG_DOMAIN_UST:
- DBG3("Copying tracing session consumer output in UST session");
- if (session->ust_session->consumer) {
- consumer_output_put(session->ust_session->consumer);
- }
- session->ust_session->consumer =
- consumer_copy_output(session->consumer);
- /* Ease our life a bit for the next part */
- consumer = session->ust_session->consumer;
- dir_name = DEFAULT_UST_TRACE_DIR;
- break;
- default:
- ret = LTTNG_ERR_UNKNOWN_DOMAIN;
- goto error;
- }
-
- /* Append correct directory to subdir */
- strncat(consumer->subdir, dir_name,
- sizeof(consumer->subdir) - strlen(consumer->subdir) - 1);
- DBG3("Copy session consumer subdir %s", consumer->subdir);
-
- ret = LTTNG_OK;
-
-error:
- return ret;
+ return (str1 && str2) && !strcmp(str1, str2);
}
/*
- * Create an UST session and add it to the session ust list.
+ * Take an option from the getopt output and set it in the right variable to be
+ * used later.
*
- * Should *NOT* be called with RCU read-side lock held.
+ * Return 0 on success else a negative value.
*/
-static int create_ust_session(struct ltt_session *session,
- struct lttng_domain *domain)
+static int set_option(int opt, const char *arg, const char *optname)
{
- int ret;
- struct ltt_ust_session *lus = NULL;
-
- assert(session);
- assert(domain);
- assert(session->consumer);
-
- switch (domain->type) {
- case LTTNG_DOMAIN_JUL:
- case LTTNG_DOMAIN_LOG4J:
- case LTTNG_DOMAIN_PYTHON:
- case LTTNG_DOMAIN_UST:
- break;
- default:
- ERR("Unknown UST domain on create session %d", domain->type);
- ret = LTTNG_ERR_UNKNOWN_DOMAIN;
- goto error;
- }
-
- DBG("Creating UST session");
-
- lus = trace_ust_create_session(session->id);
- if (lus == NULL) {
- ret = LTTNG_ERR_UST_SESS_FAIL;
- goto error;
- }
-
- lus->uid = session->uid;
- lus->gid = session->gid;
- lus->output_traces = session->output_traces;
- lus->snapshot_mode = session->snapshot_mode;
- lus->live_timer_interval = session->live_timer;
- session->ust_session = lus;
- if (session->shm_path[0]) {
- strncpy(lus->root_shm_path, session->shm_path,
- sizeof(lus->root_shm_path));
- lus->root_shm_path[sizeof(lus->root_shm_path) - 1] = '\0';
- strncpy(lus->shm_path, session->shm_path,
- sizeof(lus->shm_path));
- lus->shm_path[sizeof(lus->shm_path) - 1] = '\0';
- strncat(lus->shm_path, "/ust",
- sizeof(lus->shm_path) - strlen(lus->shm_path) - 1);
- }
- /* Copy session output to the newly created UST session */
- ret = copy_session_consumer(domain->type, session);
- if (ret != LTTNG_OK) {
- goto error;
- }
-
- return LTTNG_OK;
-
-error:
- free(lus);
- session->ust_session = NULL;
- return ret;
-}
-
-/*
- * Create a kernel tracer session then create the default channel.
- */
-static int create_kernel_session(struct ltt_session *session)
-{
- int ret;
-
- DBG("Creating kernel session");
-
- ret = kernel_create_session(session, kernel_tracer_fd);
- if (ret < 0) {
- ret = LTTNG_ERR_KERN_SESS_FAIL;
- goto error;
- }
-
- /* Code flow safety */
- assert(session->kernel_session);
-
- /* Copy session output to the newly created Kernel session */
- ret = copy_session_consumer(LTTNG_DOMAIN_KERNEL, session);
- if (ret != LTTNG_OK) {
- goto error;
- }
-
- /* Create directory(ies) on local filesystem. */
- if (session->kernel_session->consumer->type == CONSUMER_DST_LOCAL &&
- strlen(session->kernel_session->consumer->dst.trace_path) > 0) {
- ret = run_as_mkdir_recursive(
- session->kernel_session->consumer->dst.trace_path,
- S_IRWXU | S_IRWXG, session->uid, session->gid);
- if (ret < 0) {
- if (errno != EEXIST) {
- ERR("Trace directory creation error");
- goto error;
- }
- }
- }
-
- session->kernel_session->uid = session->uid;
- session->kernel_session->gid = session->gid;
- session->kernel_session->output_traces = session->output_traces;
- session->kernel_session->snapshot_mode = session->snapshot_mode;
-
- return LTTNG_OK;
-
-error:
- trace_kernel_destroy_session(session->kernel_session);
- session->kernel_session = NULL;
- return ret;
-}
-
-/*
- * Count number of session permitted by uid/gid.
- */
-static unsigned int lttng_sessions_count(uid_t uid, gid_t gid)
-{
- unsigned int i = 0;
- struct ltt_session *session;
-
- DBG("Counting number of available session for UID %d GID %d",
- uid, gid);
- cds_list_for_each_entry(session, &session_list_ptr->head, list) {
- /*
- * Only list the sessions the user can control.
- */
- if (!session_access_ok(session, uid, gid)) {
- continue;
- }
- i++;
- }
- return 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.
- *
- * "sock" is only used for special-case var. len data.
- *
- * Should *NOT* be called with RCU read-side lock held.
- */
-static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
- int *sock_error)
-{
- int ret = LTTNG_OK;
- int need_tracing_session = 1;
- int need_domain;
-
- DBG("Processing client command %d", cmd_ctx->lsm->cmd_type);
-
- assert(!rcu_read_ongoing());
-
- *sock_error = 0;
-
- switch (cmd_ctx->lsm->cmd_type) {
- case LTTNG_CREATE_SESSION:
- case LTTNG_CREATE_SESSION_SNAPSHOT:
- case LTTNG_CREATE_SESSION_LIVE:
- case LTTNG_DESTROY_SESSION:
- case LTTNG_LIST_SESSIONS:
- case LTTNG_LIST_DOMAINS:
- case LTTNG_START_TRACE:
- case LTTNG_STOP_TRACE:
- case LTTNG_DATA_PENDING:
- case LTTNG_SNAPSHOT_ADD_OUTPUT:
- case LTTNG_SNAPSHOT_DEL_OUTPUT:
- case LTTNG_SNAPSHOT_LIST_OUTPUT:
- case LTTNG_SNAPSHOT_RECORD:
- case LTTNG_SAVE_SESSION:
- case LTTNG_SET_SESSION_SHM_PATH:
- need_domain = 0;
- break;
- default:
- need_domain = 1;
- }
-
- if (opt_no_kernel && need_domain
- && cmd_ctx->lsm->domain.type == LTTNG_DOMAIN_KERNEL) {
- if (!is_root) {
- ret = LTTNG_ERR_NEED_ROOT_SESSIOND;
- } else {
- ret = LTTNG_ERR_KERN_NA;
- }
- goto error;
- }
-
- /* Deny register consumer if we already have a spawned consumer. */
- if (cmd_ctx->lsm->cmd_type == LTTNG_REGISTER_CONSUMER) {
- pthread_mutex_lock(&kconsumer_data.pid_mutex);
- if (kconsumer_data.pid > 0) {
- ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
- pthread_mutex_unlock(&kconsumer_data.pid_mutex);
- goto error;
- }
- pthread_mutex_unlock(&kconsumer_data.pid_mutex);
- }
-
- /*
- * 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_TRACEPOINT_FIELDS:
- case LTTNG_LIST_DOMAINS:
- case LTTNG_LIST_CHANNELS:
- case LTTNG_LIST_EVENTS:
- case LTTNG_LIST_SYSCALLS:
- case LTTNG_LIST_TRACKER_PIDS:
- break;
- default:
- /* Setup lttng message with no payload */
- ret = setup_lttng_msg_no_cmd_header(cmd_ctx, NULL, 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_CREATE_SESSION:
- case LTTNG_CREATE_SESSION_SNAPSHOT:
- case LTTNG_CREATE_SESSION_LIVE:
- case LTTNG_CALIBRATE:
- case LTTNG_LIST_SESSIONS:
- case LTTNG_LIST_TRACEPOINTS:
- case LTTNG_LIST_SYSCALLS:
- case LTTNG_LIST_TRACEPOINT_FIELDS:
- case LTTNG_SAVE_SESSION:
- need_tracing_session = 0;
- break;
- default:
- DBG("Getting session %s by name", cmd_ctx->lsm->session.name);
- /*
- * We keep the session list lock across _all_ commands
- * for now, because the per-session lock does not
- * handle teardown properly.
- */
- session_lock_list();
- cmd_ctx->session = session_find_by_name(cmd_ctx->lsm->session.name);
- if (cmd_ctx->session == NULL) {
- ret = LTTNG_ERR_SESS_NOT_FOUND;
- goto error;
- } else {
- /* Acquire lock for the session */
- session_lock(cmd_ctx->session);
- }
- break;
- }
-
- /*
- * Commands that need a valid session but should NOT create one if none
- * exists. Instead of creating one and destroying it when the command is
- * handled, process that right before so we save some round trip in useless
- * code path.
- */
- switch (cmd_ctx->lsm->cmd_type) {
- case LTTNG_DISABLE_CHANNEL:
- case LTTNG_DISABLE_EVENT:
- switch (cmd_ctx->lsm->domain.type) {
- case LTTNG_DOMAIN_KERNEL:
- if (!cmd_ctx->session->kernel_session) {
- ret = LTTNG_ERR_NO_CHANNEL;
- goto error;
- }
- break;
- case LTTNG_DOMAIN_JUL:
- case LTTNG_DOMAIN_LOG4J:
- case LTTNG_DOMAIN_PYTHON:
- case LTTNG_DOMAIN_UST:
- if (!cmd_ctx->session->ust_session) {
- ret = LTTNG_ERR_NO_CHANNEL;
- goto error;
- }
- break;
- default:
- ret = LTTNG_ERR_UNKNOWN_DOMAIN;
- goto error;
- }
- default:
- break;
- }
-
- if (!need_domain) {
- goto skip_domain;
- }
-
- /*
- * Check domain type for specific "pre-action".
- */
- switch (cmd_ctx->lsm->domain.type) {
- case LTTNG_DOMAIN_KERNEL:
- if (!is_root) {
- ret = LTTNG_ERR_NEED_ROOT_SESSIOND;
- goto error;
- }
-
- /* Kernel tracer check */
- if (kernel_tracer_fd == -1) {
- /* Basically, load kernel tracer modules */
- ret = init_kernel_tracer();
- if (ret != 0) {
- goto error;
- }
- }
-
- /* Consumer is in an ERROR state. Report back to client */
- if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) {
- ret = LTTNG_ERR_NO_KERNCONSUMERD;
- 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 = LTTNG_ERR_KERN_SESS_FAIL;
- goto error;
- }
- }
-
- /* Start the kernel consumer daemon */
- pthread_mutex_lock(&kconsumer_data.pid_mutex);
- if (kconsumer_data.pid == 0 &&
- cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
- pthread_mutex_unlock(&kconsumer_data.pid_mutex);
- ret = start_consumerd(&kconsumer_data);
- if (ret < 0) {
- ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
- goto error;
- }
- uatomic_set(&kernel_consumerd_state, CONSUMER_STARTED);
- } else {
- pthread_mutex_unlock(&kconsumer_data.pid_mutex);
- }
-
- /*
- * The consumer was just spawned so we need to add the socket to
- * the consumer output of the session if exist.
- */
- ret = consumer_create_socket(&kconsumer_data,
- cmd_ctx->session->kernel_session->consumer);
- if (ret < 0) {
- goto error;
- }
- }
-
- break;
- case LTTNG_DOMAIN_JUL:
- case LTTNG_DOMAIN_LOG4J:
- case LTTNG_DOMAIN_PYTHON:
- case LTTNG_DOMAIN_UST:
- {
- if (!ust_app_supported()) {
- ret = LTTNG_ERR_NO_UST;
- goto error;
- }
- /* Consumer is in an ERROR state. Report back to client */
- if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
- ret = LTTNG_ERR_NO_USTCONSUMERD;
- goto error;
- }
-
- if (need_tracing_session) {
- /* Create UST session if none exist. */
- if (cmd_ctx->session->ust_session == NULL) {
- ret = create_ust_session(cmd_ctx->session,
- &cmd_ctx->lsm->domain);
- if (ret != LTTNG_OK) {
- goto error;
- }
- }
-
- /* Start the UST consumer daemons */
- /* 64-bit */
- pthread_mutex_lock(&ustconsumer64_data.pid_mutex);
- if (consumerd64_bin[0] != '\0' &&
- ustconsumer64_data.pid == 0 &&
- cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
- pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
- ret = start_consumerd(&ustconsumer64_data);
- if (ret < 0) {
- ret = LTTNG_ERR_UST_CONSUMER64_FAIL;
- uatomic_set(&ust_consumerd64_fd, -EINVAL);
- goto error;
- }
-
- uatomic_set(&ust_consumerd64_fd, ustconsumer64_data.cmd_sock);
- uatomic_set(&ust_consumerd_state, CONSUMER_STARTED);
- } else {
- pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
- }
-
- /*
- * Setup socket for consumer 64 bit. No need for atomic access
- * since it was set above and can ONLY be set in this thread.
- */
- ret = consumer_create_socket(&ustconsumer64_data,
- cmd_ctx->session->ust_session->consumer);
- if (ret < 0) {
- goto error;
- }
-
- /* 32-bit */
- pthread_mutex_lock(&ustconsumer32_data.pid_mutex);
- if (consumerd32_bin[0] != '\0' &&
- ustconsumer32_data.pid == 0 &&
- cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
- pthread_mutex_unlock(&ustconsumer32_data.pid_mutex);
- ret = start_consumerd(&ustconsumer32_data);
- if (ret < 0) {
- ret = LTTNG_ERR_UST_CONSUMER32_FAIL;
- uatomic_set(&ust_consumerd32_fd, -EINVAL);
- goto error;
- }
-
- uatomic_set(&ust_consumerd32_fd, ustconsumer32_data.cmd_sock);
- uatomic_set(&ust_consumerd_state, CONSUMER_STARTED);
- } else {
- pthread_mutex_unlock(&ustconsumer32_data.pid_mutex);
- }
-
- /*
- * Setup socket for consumer 64 bit. No need for atomic access
- * since it was set above and can ONLY be set in this thread.
- */
- ret = consumer_create_socket(&ustconsumer32_data,
- cmd_ctx->session->ust_session->consumer);
- if (ret < 0) {
- goto error;
- }
- }
- break;
- }
- default:
- break;
- }
-skip_domain:
-
- /* Validate consumer daemon state when start/stop trace command */
- if (cmd_ctx->lsm->cmd_type == LTTNG_START_TRACE ||
- cmd_ctx->lsm->cmd_type == LTTNG_STOP_TRACE) {
- switch (cmd_ctx->lsm->domain.type) {
- case LTTNG_DOMAIN_JUL:
- case LTTNG_DOMAIN_LOG4J:
- case LTTNG_DOMAIN_PYTHON:
- case LTTNG_DOMAIN_UST:
- if (uatomic_read(&ust_consumerd_state) != CONSUMER_STARTED) {
- ret = LTTNG_ERR_NO_USTCONSUMERD;
- goto error;
- }
- break;
- case LTTNG_DOMAIN_KERNEL:
- if (uatomic_read(&kernel_consumerd_state) != CONSUMER_STARTED) {
- ret = LTTNG_ERR_NO_KERNCONSUMERD;
- goto error;
- }
- break;
- }
- }
-
- /*
- * Check that the UID or GID match that of the tracing session.
- * The root user can interact with all sessions.
- */
- if (need_tracing_session) {
- if (!session_access_ok(cmd_ctx->session,
- LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
- LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds))) {
- ret = LTTNG_ERR_EPERM;
- goto error;
- }
- }
-
- /*
- * Send relayd information to consumer as soon as we have a domain and a
- * session defined.
- */
- if (cmd_ctx->session && need_domain) {
- /*
- * Setup relayd if not done yet. If the relayd information was already
- * sent to the consumer, this call will gracefully return.
- */
- ret = cmd_setup_relayd(cmd_ctx->session);
- if (ret != LTTNG_OK) {
- goto error;
- }
- }
-
- /* Process by command type */
- switch (cmd_ctx->lsm->cmd_type) {
- case LTTNG_ADD_CONTEXT:
- {
- /*
- * An LTTNG_ADD_CONTEXT command might have a supplementary
- * payload if the context being added is an application context.
- */
- if (cmd_ctx->lsm->u.context.ctx.ctx ==
- LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
- char *provider_name = NULL, *context_name = NULL;
- size_t provider_name_len =
- cmd_ctx->lsm->u.context.provider_name_len;
- size_t context_name_len =
- cmd_ctx->lsm->u.context.context_name_len;
-
- if (provider_name_len == 0 || context_name_len == 0) {
- /*
- * Application provider and context names MUST
- * be provided.
- */
- ret = -LTTNG_ERR_INVALID;
- goto error;
- }
-
- provider_name = zmalloc(provider_name_len + 1);
- if (!provider_name) {
- ret = -LTTNG_ERR_NOMEM;
- goto error;
- }
- cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name =
- provider_name;
-
- context_name = zmalloc(context_name_len + 1);
- if (!context_name) {
- ret = -LTTNG_ERR_NOMEM;
- goto error_add_context;
- }
- cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name =
- context_name;
-
- ret = lttcomm_recv_unix_sock(sock, provider_name,
- provider_name_len);
- if (ret < 0) {
- goto error_add_context;
- }
-
- ret = lttcomm_recv_unix_sock(sock, context_name,
- context_name_len);
- if (ret < 0) {
- goto error_add_context;
- }
- }
-
- /*
- * cmd_add_context assumes ownership of the provider and context
- * names.
- */
- ret = cmd_add_context(cmd_ctx->session,
- cmd_ctx->lsm->domain.type,
- cmd_ctx->lsm->u.context.channel_name,
- &cmd_ctx->lsm->u.context.ctx,
- kernel_poll_pipe[1]);
-
- cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name = NULL;
- cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name = NULL;
-error_add_context:
- free(cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name);
- free(cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name);
- if (ret < 0) {
- goto error;
- }
- 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:
- {
-
- /*
- * FIXME: handle filter; for now we just receive the filter's
- * bytecode along with the filter expression which are sent by
- * liblttng-ctl and discard them.
- *
- * This fixes an issue where the client may block while sending
- * the filter payload and encounter an error because the session
- * daemon closes the socket without ever handling this data.
- */
- size_t count = cmd_ctx->lsm->u.disable.expression_len +
- cmd_ctx->lsm->u.disable.bytecode_len;
-
- if (count) {
- char data[LTTNG_FILTER_MAX_LEN];
-
- DBG("Discarding disable event command payload of size %zu", count);
- while (count) {
- ret = lttcomm_recv_unix_sock(sock, data,
- count > sizeof(data) ? sizeof(data) : count);
- if (ret < 0) {
- goto error;
- }
-
- count -= (size_t) ret;
- }
- }
- /* FIXME: passing packed structure to non-packed pointer */
- ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
- cmd_ctx->lsm->u.disable.channel_name,
- &cmd_ctx->lsm->u.disable.event);
- break;
- }
- case LTTNG_ENABLE_CHANNEL:
- {
- ret = cmd_enable_channel(cmd_ctx->session, &cmd_ctx->lsm->domain,
- &cmd_ctx->lsm->u.channel.chan, kernel_poll_pipe[1]);
- break;
- }
- case LTTNG_TRACK_PID:
- {
- ret = cmd_track_pid(cmd_ctx->session,
- cmd_ctx->lsm->domain.type,
- cmd_ctx->lsm->u.pid_tracker.pid);
- break;
- }
- case LTTNG_UNTRACK_PID:
- {
- ret = cmd_untrack_pid(cmd_ctx->session,
- cmd_ctx->lsm->domain.type,
- cmd_ctx->lsm->u.pid_tracker.pid);
- break;
- }
- case LTTNG_ENABLE_EVENT:
- {
- struct lttng_event_exclusion *exclusion = NULL;
- struct lttng_filter_bytecode *bytecode = NULL;
- char *filter_expression = NULL;
-
- /* Handle exclusion events and receive it from the client. */
- if (cmd_ctx->lsm->u.enable.exclusion_count > 0) {
- size_t count = cmd_ctx->lsm->u.enable.exclusion_count;
-
- exclusion = zmalloc(sizeof(struct lttng_event_exclusion) +
- (count * LTTNG_SYMBOL_NAME_LEN));
- if (!exclusion) {
- ret = LTTNG_ERR_EXCLUSION_NOMEM;
- goto error;
- }
-
- DBG("Receiving var len exclusion event list from client ...");
- exclusion->count = count;
- ret = lttcomm_recv_unix_sock(sock, exclusion->names,
- count * LTTNG_SYMBOL_NAME_LEN);
- if (ret <= 0) {
- DBG("Nothing recv() from client var len data... continuing");
- *sock_error = 1;
- free(exclusion);
- ret = LTTNG_ERR_EXCLUSION_INVAL;
- goto error;
- }
- }
-
- /* Get filter expression from client. */
- if (cmd_ctx->lsm->u.enable.expression_len > 0) {
- size_t expression_len =
- cmd_ctx->lsm->u.enable.expression_len;
-
- if (expression_len > LTTNG_FILTER_MAX_LEN) {
- ret = LTTNG_ERR_FILTER_INVAL;
- free(exclusion);
- goto error;
- }
-
- filter_expression = zmalloc(expression_len);
- if (!filter_expression) {
- free(exclusion);
- ret = LTTNG_ERR_FILTER_NOMEM;
- goto error;
- }
-
- /* Receive var. len. data */
- DBG("Receiving var len filter's expression from client ...");
- ret = lttcomm_recv_unix_sock(sock, filter_expression,
- expression_len);
- if (ret <= 0) {
- DBG("Nothing recv() from client car len data... continuing");
- *sock_error = 1;
- free(filter_expression);
- free(exclusion);
- ret = LTTNG_ERR_FILTER_INVAL;
- goto error;
- }
- }
-
- /* Handle filter and get bytecode from client. */
- if (cmd_ctx->lsm->u.enable.bytecode_len > 0) {
- size_t bytecode_len = cmd_ctx->lsm->u.enable.bytecode_len;
-
- if (bytecode_len > LTTNG_FILTER_MAX_LEN) {
- ret = LTTNG_ERR_FILTER_INVAL;
- free(filter_expression);
- free(exclusion);
- goto error;
- }
-
- bytecode = zmalloc(bytecode_len);
- if (!bytecode) {
- free(filter_expression);
- free(exclusion);
- ret = LTTNG_ERR_FILTER_NOMEM;
- goto error;
- }
-
- /* Receive var. len. data */
- DBG("Receiving var len filter's bytecode from client ...");
- ret = lttcomm_recv_unix_sock(sock, bytecode, bytecode_len);
- if (ret <= 0) {
- DBG("Nothing recv() from client car len data... continuing");
- *sock_error = 1;
- free(filter_expression);
- free(bytecode);
- free(exclusion);
- ret = LTTNG_ERR_FILTER_INVAL;
- goto error;
- }
-
- if ((bytecode->len + sizeof(*bytecode)) != bytecode_len) {
- free(filter_expression);
- free(bytecode);
- free(exclusion);
- ret = LTTNG_ERR_FILTER_INVAL;
- goto error;
- }
- }
-
- ret = cmd_enable_event(cmd_ctx->session, &cmd_ctx->lsm->domain,
- cmd_ctx->lsm->u.enable.channel_name,
- &cmd_ctx->lsm->u.enable.event,
- filter_expression, bytecode, exclusion,
- kernel_poll_pipe[1]);
- break;
- }
- case LTTNG_LIST_TRACEPOINTS:
- {
- struct lttng_event *events;
- ssize_t nb_events;
-
- session_lock_list();
- nb_events = cmd_list_tracepoints(cmd_ctx->lsm->domain.type, &events);
- session_unlock_list();
- if (nb_events < 0) {
- /* Return value is a negative lttng_error_code. */
- ret = -nb_events;
- goto error;
- }
-
- /*
- * 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_no_cmd_header(cmd_ctx, events,
- sizeof(struct lttng_event) * nb_events);
- free(events);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_LIST_TRACEPOINT_FIELDS:
- {
- struct lttng_event_field *fields;
- ssize_t nb_fields;
-
- session_lock_list();
- nb_fields = cmd_list_tracepoint_fields(cmd_ctx->lsm->domain.type,
- &fields);
- session_unlock_list();
- if (nb_fields < 0) {
- /* Return value is a negative lttng_error_code. */
- ret = -nb_fields;
- goto error;
- }
-
- /*
- * 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_no_cmd_header(cmd_ctx, fields,
- sizeof(struct lttng_event_field) * nb_fields);
- free(fields);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_LIST_SYSCALLS:
- {
- struct lttng_event *events;
- ssize_t nb_events;
-
- nb_events = cmd_list_syscalls(&events);
- if (nb_events < 0) {
- /* Return value is a negative lttng_error_code. */
- ret = -nb_events;
- goto error;
- }
-
- /*
- * 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_no_cmd_header(cmd_ctx, events,
- sizeof(struct lttng_event) * nb_events);
- free(events);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_LIST_TRACKER_PIDS:
- {
- int32_t *pids = NULL;
- ssize_t nr_pids;
-
- nr_pids = cmd_list_tracker_pids(cmd_ctx->session,
- cmd_ctx->lsm->domain.type, &pids);
- if (nr_pids < 0) {
- /* Return value is a negative lttng_error_code. */
- ret = -nr_pids;
- goto error;
- }
-
- /*
- * 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_no_cmd_header(cmd_ctx, pids,
- sizeof(int32_t) * nr_pids);
- free(pids);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_SET_CONSUMER_URI:
- {
- size_t nb_uri, len;
- struct lttng_uri *uris;
-
- nb_uri = cmd_ctx->lsm->u.uri.size;
- len = nb_uri * sizeof(struct lttng_uri);
-
- if (nb_uri == 0) {
- ret = LTTNG_ERR_INVALID;
- goto error;
- }
-
- uris = zmalloc(len);
- if (uris == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto error;
- }
-
- /* Receive variable len data */
- DBG("Receiving %zu URI(s) from client ...", nb_uri);
- ret = lttcomm_recv_unix_sock(sock, uris, len);
- if (ret <= 0) {
- DBG("No URIs received from client... continuing");
- *sock_error = 1;
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
-
- ret = cmd_set_consumer_uri(cmd_ctx->session, nb_uri, uris);
- free(uris);
- if (ret != LTTNG_OK) {
- goto error;
- }
-
-
- break;
- }
- case LTTNG_START_TRACE:
- {
- ret = cmd_start_trace(cmd_ctx->session);
- break;
- }
- case LTTNG_STOP_TRACE:
- {
- ret = cmd_stop_trace(cmd_ctx->session);
- break;
- }
- case LTTNG_CREATE_SESSION:
- {
- size_t nb_uri, len;
- struct lttng_uri *uris = NULL;
-
- nb_uri = cmd_ctx->lsm->u.uri.size;
- len = nb_uri * sizeof(struct lttng_uri);
-
- if (nb_uri > 0) {
- uris = zmalloc(len);
- if (uris == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto error;
- }
-
- /* Receive variable len data */
- DBG("Waiting for %zu URIs from client ...", nb_uri);
- ret = lttcomm_recv_unix_sock(sock, uris, len);
- if (ret <= 0) {
- DBG("No URIs received from client... continuing");
- *sock_error = 1;
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
-
- if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
- DBG("Creating session with ONE network URI is a bad call");
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
- }
-
- ret = cmd_create_session_uri(cmd_ctx->lsm->session.name, uris, nb_uri,
- &cmd_ctx->creds, 0);
-
- free(uris);
-
- break;
- }
- case LTTNG_DESTROY_SESSION:
- {
- ret = cmd_destroy_session(cmd_ctx->session, kernel_poll_pipe[1]);
-
- /* Set session to NULL so we do not unlock it after free. */
- cmd_ctx->session = NULL;
- break;
- }
- case LTTNG_LIST_DOMAINS:
- {
- ssize_t nb_dom;
- struct lttng_domain *domains = NULL;
-
- nb_dom = cmd_list_domains(cmd_ctx->session, &domains);
- if (nb_dom < 0) {
- /* Return value is a negative lttng_error_code. */
- ret = -nb_dom;
- goto error;
- }
-
- ret = setup_lttng_msg_no_cmd_header(cmd_ctx, domains,
- nb_dom * sizeof(struct lttng_domain));
- free(domains);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_LIST_CHANNELS:
- {
- ssize_t payload_size;
- struct lttng_channel *channels = NULL;
-
- payload_size = cmd_list_channels(cmd_ctx->lsm->domain.type,
- cmd_ctx->session, &channels);
- if (payload_size < 0) {
- /* Return value is a negative lttng_error_code. */
- ret = -payload_size;
- goto error;
- }
-
- ret = setup_lttng_msg_no_cmd_header(cmd_ctx, channels,
- payload_size);
- free(channels);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_LIST_EVENTS:
- {
- ssize_t nb_event;
- struct lttng_event *events = NULL;
- struct lttcomm_event_command_header cmd_header;
- size_t total_size;
-
- memset(&cmd_header, 0, sizeof(cmd_header));
- /* Extended infos are included at the end of events */
- nb_event = cmd_list_events(cmd_ctx->lsm->domain.type,
- cmd_ctx->session, cmd_ctx->lsm->u.list.channel_name,
- &events, &total_size);
-
- if (nb_event < 0) {
- /* Return value is a negative lttng_error_code. */
- ret = -nb_event;
- goto error;
- }
-
- cmd_header.nb_events = nb_event;
- ret = setup_lttng_msg(cmd_ctx, events, total_size,
- &cmd_header, sizeof(cmd_header));
- free(events);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_LIST_SESSIONS:
- {
- unsigned int nr_sessions;
- void *sessions_payload;
- size_t payload_len;
-
- session_lock_list();
- nr_sessions = lttng_sessions_count(
- LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
- LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
- payload_len = sizeof(struct lttng_session) * nr_sessions;
- sessions_payload = zmalloc(payload_len);
-
- if (!sessions_payload) {
- session_unlock_list();
- ret = -ENOMEM;
- goto setup_error;
- }
-
- cmd_list_lttng_sessions(sessions_payload,
- LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
- LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
- session_unlock_list();
-
- ret = setup_lttng_msg_no_cmd_header(cmd_ctx, sessions_payload,
- payload_len);
- free(sessions_payload);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_CALIBRATE:
- {
- ret = cmd_calibrate(cmd_ctx->lsm->domain.type,
- &cmd_ctx->lsm->u.calibrate);
- break;
- }
- case LTTNG_REGISTER_CONSUMER:
- {
- struct consumer_data *cdata;
-
- switch (cmd_ctx->lsm->domain.type) {
- case LTTNG_DOMAIN_KERNEL:
- cdata = &kconsumer_data;
- break;
- default:
- ret = LTTNG_ERR_UND;
- goto error;
- }
-
- ret = cmd_register_consumer(cmd_ctx->session, cmd_ctx->lsm->domain.type,
- cmd_ctx->lsm->u.reg.path, cdata);
- break;
- }
- case LTTNG_DATA_PENDING:
- {
- int pending_ret;
- uint8_t pending_ret_byte;
-
- pending_ret = cmd_data_pending(cmd_ctx->session);
-
- /*
- * FIXME
- *
- * This function may returns 0 or 1 to indicate whether or not
- * there is data pending. In case of error, it should return an
- * LTTNG_ERR code. However, some code paths may still return
- * a nondescript error code, which we handle by returning an
- * "unknown" error.
- */
- if (pending_ret == 0 || pending_ret == 1) {
- /*
- * ret will be set to LTTNG_OK at the end of
- * this function.
- */
- } else if (pending_ret < 0) {
- ret = LTTNG_ERR_UNK;
- goto setup_error;
- } else {
- ret = pending_ret;
- goto setup_error;
- }
-
- pending_ret_byte = (uint8_t) pending_ret;
-
- /* 1 byte to return whether or not data is pending */
- ret = setup_lttng_msg_no_cmd_header(cmd_ctx,
- &pending_ret_byte, 1);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_SNAPSHOT_ADD_OUTPUT:
- {
- struct lttcomm_lttng_output_id reply;
-
- ret = cmd_snapshot_add_output(cmd_ctx->session,
- &cmd_ctx->lsm->u.snapshot_output.output, &reply.id);
- if (ret != LTTNG_OK) {
- goto error;
- }
-
- ret = setup_lttng_msg_no_cmd_header(cmd_ctx, &reply,
- sizeof(reply));
- if (ret < 0) {
- goto setup_error;
- }
-
- /* Copy output list into message payload */
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_SNAPSHOT_DEL_OUTPUT:
- {
- ret = cmd_snapshot_del_output(cmd_ctx->session,
- &cmd_ctx->lsm->u.snapshot_output.output);
- break;
- }
- case LTTNG_SNAPSHOT_LIST_OUTPUT:
- {
- ssize_t nb_output;
- struct lttng_snapshot_output *outputs = NULL;
-
- nb_output = cmd_snapshot_list_outputs(cmd_ctx->session, &outputs);
- if (nb_output < 0) {
- ret = -nb_output;
- goto error;
- }
-
- assert((nb_output > 0 && outputs) || nb_output == 0);
- ret = setup_lttng_msg_no_cmd_header(cmd_ctx, outputs,
- nb_output * sizeof(struct lttng_snapshot_output));
- free(outputs);
-
- if (ret < 0) {
- goto setup_error;
- }
-
- ret = LTTNG_OK;
- break;
- }
- case LTTNG_SNAPSHOT_RECORD:
- {
- ret = cmd_snapshot_record(cmd_ctx->session,
- &cmd_ctx->lsm->u.snapshot_record.output,
- cmd_ctx->lsm->u.snapshot_record.wait);
- break;
- }
- case LTTNG_CREATE_SESSION_SNAPSHOT:
- {
- size_t nb_uri, len;
- struct lttng_uri *uris = NULL;
-
- nb_uri = cmd_ctx->lsm->u.uri.size;
- len = nb_uri * sizeof(struct lttng_uri);
-
- if (nb_uri > 0) {
- uris = zmalloc(len);
- if (uris == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto error;
- }
-
- /* Receive variable len data */
- DBG("Waiting for %zu URIs from client ...", nb_uri);
- ret = lttcomm_recv_unix_sock(sock, uris, len);
- if (ret <= 0) {
- DBG("No URIs received from client... continuing");
- *sock_error = 1;
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
-
- if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
- DBG("Creating session with ONE network URI is a bad call");
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
- }
-
- ret = cmd_create_session_snapshot(cmd_ctx->lsm->session.name, uris,
- nb_uri, &cmd_ctx->creds);
- free(uris);
- break;
- }
- case LTTNG_CREATE_SESSION_LIVE:
- {
- size_t nb_uri, len;
- struct lttng_uri *uris = NULL;
-
- nb_uri = cmd_ctx->lsm->u.uri.size;
- len = nb_uri * sizeof(struct lttng_uri);
-
- if (nb_uri > 0) {
- uris = zmalloc(len);
- if (uris == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto error;
- }
-
- /* Receive variable len data */
- DBG("Waiting for %zu URIs from client ...", nb_uri);
- ret = lttcomm_recv_unix_sock(sock, uris, len);
- if (ret <= 0) {
- DBG("No URIs received from client... continuing");
- *sock_error = 1;
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
-
- if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
- DBG("Creating session with ONE network URI is a bad call");
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
- }
-
- ret = cmd_create_session_uri(cmd_ctx->lsm->session.name, uris,
- nb_uri, &cmd_ctx->creds, cmd_ctx->lsm->u.session_live.timer_interval);
- free(uris);
- break;
- }
- case LTTNG_SAVE_SESSION:
- {
- ret = cmd_save_sessions(&cmd_ctx->lsm->u.save_session.attr,
- &cmd_ctx->creds);
- break;
- }
- case LTTNG_SET_SESSION_SHM_PATH:
- {
- ret = cmd_set_session_shm_path(cmd_ctx->session,
- cmd_ctx->lsm->u.set_shm_path.shm_path);
- break;
- }
- default:
- ret = LTTNG_ERR_UND;
- break;
- }
-
-error:
- if (cmd_ctx->llm == NULL) {
- DBG("Missing llm structure. Allocating one.");
- if (setup_lttng_msg_no_cmd_header(cmd_ctx, NULL, 0) < 0) {
- goto setup_error;
- }
- }
- /* Set return code */
- cmd_ctx->llm->ret_code = ret;
-setup_error:
- if (cmd_ctx->session) {
- session_unlock(cmd_ctx->session);
- }
- if (need_tracing_session) {
- session_unlock_list();
- }
-init_setup_error:
- assert(!rcu_read_ongoing());
- return ret;
-}
-
-/*
- * Thread managing health check socket.
- */
-static void *thread_manage_health(void *data)
-{
- int sock = -1, new_sock = -1, ret, i, pollfd, err = -1;
- uint32_t revents, nb_fd;
- struct lttng_poll_event events;
- struct health_comm_msg msg;
- struct health_comm_reply reply;
-
- DBG("[thread] Manage health check started");
-
- rcu_register_thread();
-
- /* We might hit an error path before this is created. */
- lttng_poll_init(&events);
-
- /* Create unix socket */
- sock = lttcomm_create_unix_sock(health_unix_sock_path);
- if (sock < 0) {
- ERR("Unable to create health check Unix socket");
- ret = -1;
- goto error;
- }
-
- if (is_root) {
- /* lttng health client socket path permissions */
- ret = chown(health_unix_sock_path, 0,
- utils_get_group_id(tracing_group_name));
- if (ret < 0) {
- ERR("Unable to set group on %s", health_unix_sock_path);
- PERROR("chown");
- ret = -1;
- goto error;
- }
-
- ret = chmod(health_unix_sock_path,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
- if (ret < 0) {
- ERR("Unable to set permissions on %s", health_unix_sock_path);
- PERROR("chmod");
- ret = -1;
- goto error;
- }
- }
-
- /*
- * Set the CLOEXEC flag. Return code is useless because either way, the
- * show must go on.
- */
- (void) utils_set_fd_cloexec(sock);
-
- ret = lttcomm_listen_unix_sock(sock);
- if (ret < 0) {
- goto error;
- }
-
- /*
- * Pass 2 as size here for the thread quit pipe and client_sock. Nothing
- * more will be added to this poll set.
- */
- ret = sessiond_set_thread_pollset(&events, 2);
- if (ret < 0) {
- goto error;
- }
-
- /* Add the application registration socket */
- ret = lttng_poll_add(&events, sock, LPOLLIN | LPOLLPRI);
- if (ret < 0) {
- goto error;
- }
-
- sessiond_notify_ready();
-
- while (1) {
- DBG("Health check ready");
-
- /* Inifinite blocking call, waiting for transmission */
-restart:
- ret = lttng_poll_wait(&events, -1);
- if (ret < 0) {
- /*
- * Restart interrupted system call.
- */
- if (errno == EINTR) {
- goto restart;
- }
- goto error;
- }
-
- nb_fd = ret;
-
- for (i = 0; i < nb_fd; i++) {
- /* Fetch once the poll data */
- revents = LTTNG_POLL_GETEV(&events, i);
- pollfd = LTTNG_POLL_GETFD(&events, i);
-
- if (!revents) {
- /* No activity for this FD (poll implementation). */
- continue;
- }
-
- /* Thread quit pipe has been closed. Killing thread. */
- ret = sessiond_check_thread_quit_pipe(pollfd, revents);
- if (ret) {
- err = 0;
- goto exit;
- }
-
- /* Event on the registration socket */
- if (pollfd == sock) {
- if (revents & LPOLLIN) {
- continue;
- } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
- ERR("Health socket poll error");
- goto error;
- } else {
- ERR("Unexpected poll events %u for sock %d", revents, pollfd);
- goto error;
- }
- }
- }
-
- new_sock = lttcomm_accept_unix_sock(sock);
- if (new_sock < 0) {
- goto error;
- }
-
- /*
- * Set the CLOEXEC flag. Return code is useless because either way, the
- * show must go on.
- */
- (void) utils_set_fd_cloexec(new_sock);
-
- DBG("Receiving data from client for health...");
- ret = lttcomm_recv_unix_sock(new_sock, (void *)&msg, sizeof(msg));
- if (ret <= 0) {
- DBG("Nothing recv() from client... continuing");
- ret = close(new_sock);
- if (ret) {
- PERROR("close");
- }
- new_sock = -1;
- continue;
- }
-
- rcu_thread_online();
-
- memset(&reply, 0, sizeof(reply));
- for (i = 0; i < NR_HEALTH_SESSIOND_TYPES; i++) {
- /*
- * health_check_state returns 0 if health is
- * bad.
- */
- if (!health_check_state(health_sessiond, i)) {
- reply.ret_code |= 1ULL << i;
- }
- }
-
- DBG2("Health check return value %" PRIx64, reply.ret_code);
-
- ret = send_unix_sock(new_sock, (void *) &reply, sizeof(reply));
- if (ret < 0) {
- ERR("Failed to send health data back to client");
- }
-
- /* End of transmission */
- ret = close(new_sock);
- if (ret) {
- PERROR("close");
- }
- new_sock = -1;
- }
-
-exit:
-error:
- if (err) {
- ERR("Health error occurred in %s", __func__);
- }
- DBG("Health check thread dying");
- unlink(health_unix_sock_path);
- if (sock >= 0) {
- ret = close(sock);
- if (ret) {
- PERROR("close");
- }
- }
-
- lttng_poll_clean(&events);
-
- rcu_unregister_thread();
- return NULL;
-}
-
-/*
- * This thread manage all clients request using the unix client socket for
- * communication.
- */
-static void *thread_manage_clients(void *data)
-{
- int sock = -1, ret, i, pollfd, err = -1;
- int sock_error;
- uint32_t revents, nb_fd;
- struct command_ctx *cmd_ctx = NULL;
- struct lttng_poll_event events;
-
- DBG("[thread] Manage client started");
-
- rcu_register_thread();
-
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_CMD);
-
- health_code_update();
-
- ret = lttcomm_listen_unix_sock(client_sock);
- if (ret < 0) {
- goto error_listen;
- }
-
- /*
- * Pass 2 as size here for the thread quit pipe and client_sock. Nothing
- * more will be added to this poll set.
- */
- ret = sessiond_set_thread_pollset(&events, 2);
- if (ret < 0) {
- goto error_create_poll;
- }
-
- /* Add the application registration socket */
- ret = lttng_poll_add(&events, client_sock, LPOLLIN | LPOLLPRI);
- if (ret < 0) {
- goto error;
- }
-
- sessiond_notify_ready();
- ret = sem_post(&load_info->message_thread_ready);
- if (ret) {
- PERROR("sem_post message_thread_ready");
- goto error;
- }
-
- /* This testpoint is after we signal readiness to the parent. */
- if (testpoint(sessiond_thread_manage_clients)) {
- goto error;
- }
-
- if (testpoint(sessiond_thread_manage_clients_before_loop)) {
- goto error;
- }
-
- health_code_update();
-
- while (1) {
- DBG("Accepting client command ...");
-
- /* Inifinite blocking call, waiting for transmission */
- restart:
- health_poll_entry();
- ret = lttng_poll_wait(&events, -1);
- health_poll_exit();
- if (ret < 0) {
- /*
- * Restart interrupted system call.
- */
- if (errno == EINTR) {
- goto restart;
- }
- goto error;
- }
-
- nb_fd = ret;
-
- for (i = 0; i < nb_fd; i++) {
- /* Fetch once the poll data */
- revents = LTTNG_POLL_GETEV(&events, i);
- pollfd = LTTNG_POLL_GETFD(&events, i);
-
- health_code_update();
-
- if (!revents) {
- /* No activity for this FD (poll implementation). */
- continue;
- }
-
- /* Thread quit pipe has been closed. Killing thread. */
- ret = sessiond_check_thread_quit_pipe(pollfd, revents);
- if (ret) {
- err = 0;
- goto exit;
- }
-
- /* Event on the registration socket */
- if (pollfd == client_sock) {
- if (revents & LPOLLIN) {
- continue;
- } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
- ERR("Client socket poll error");
- goto error;
- } else {
- ERR("Unexpected poll events %u for sock %d", revents, pollfd);
- goto error;
- }
- }
- }
-
- DBG("Wait for client response");
-
- health_code_update();
-
- sock = lttcomm_accept_unix_sock(client_sock);
- if (sock < 0) {
- goto error;
- }
-
- /*
- * Set the CLOEXEC flag. Return code is useless because either way, the
- * show must go on.
- */
- (void) utils_set_fd_cloexec(sock);
-
- /* Set socket option for credentials retrieval */
- ret = lttcomm_setsockopt_creds_unix_sock(sock);
- if (ret < 0) {
- goto error;
- }
-
- /* Allocate context command to process the client request */
- cmd_ctx = zmalloc(sizeof(struct command_ctx));
- if (cmd_ctx == NULL) {
- PERROR("zmalloc cmd_ctx");
- goto error;
- }
-
- /* Allocate data buffer for reception */
- cmd_ctx->lsm = zmalloc(sizeof(struct lttcomm_session_msg));
- if (cmd_ctx->lsm == NULL) {
- PERROR("zmalloc cmd_ctx->lsm");
- goto error;
- }
-
- cmd_ctx->llm = NULL;
- cmd_ctx->session = NULL;
-
- health_code_update();
-
- /*
- * Data is received from the lttng client. The struct
- * lttcomm_session_msg (lsm) contains the command and data request of
- * the client.
- */
- DBG("Receiving data from client ...");
- ret = lttcomm_recv_creds_unix_sock(sock, cmd_ctx->lsm,
- sizeof(struct lttcomm_session_msg), &cmd_ctx->creds);
- if (ret <= 0) {
- DBG("Nothing recv() from client... continuing");
- ret = close(sock);
- if (ret) {
- PERROR("close");
- }
- sock = -1;
- clean_command_ctx(&cmd_ctx);
- continue;
- }
-
- health_code_update();
-
- // TODO: Validate cmd_ctx including sanity check for
- // security purpose.
-
- rcu_thread_online();
- /*
- * This function dispatch the work to the kernel or userspace tracer
- * libs and fill the lttcomm_lttng_msg data structure of all the needed
- * informations for the client. The command context struct contains
- * everything this function may needs.
- */
- ret = process_client_msg(cmd_ctx, sock, &sock_error);
- rcu_thread_offline();
- if (ret < 0) {
- ret = close(sock);
- if (ret) {
- PERROR("close");
- }
- sock = -1;
- /*
- * TODO: Inform client somehow of the fatal error. At
- * this point, ret < 0 means that a zmalloc failed
- * (ENOMEM). Error detected but still accept
- * command, unless a socket error has been
- * detected.
- */
- clean_command_ctx(&cmd_ctx);
- continue;
- }
-
- health_code_update();
-
- DBG("Sending response (size: %d, retcode: %s (%d))",
- cmd_ctx->lttng_msg_size,
- lttng_strerror(-cmd_ctx->llm->ret_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");
- }
-
- /* End of transmission */
- ret = close(sock);
- if (ret) {
- PERROR("close");
- }
- sock = -1;
-
- clean_command_ctx(&cmd_ctx);
-
- health_code_update();
- }
-
-exit:
-error:
- if (sock >= 0) {
- ret = close(sock);
- if (ret) {
- PERROR("close");
- }
- }
-
- lttng_poll_clean(&events);
- clean_command_ctx(&cmd_ctx);
-
-error_listen:
-error_create_poll:
- unlink(client_unix_sock_path);
- if (client_sock >= 0) {
- ret = close(client_sock);
- if (ret) {
- PERROR("close");
- }
- }
-
- if (err) {
- health_error();
- ERR("Health error occurred in %s", __func__);
- }
-
- health_unregister(health_sessiond);
-
- DBG("Client thread dying");
-
- rcu_unregister_thread();
-
- /*
- * Since we are creating the consumer threads, we own them, so we need
- * to join them before our thread exits.
- */
- ret = join_consumer_thread(&kconsumer_data);
- if (ret) {
- errno = ret;
- PERROR("join_consumer");
- }
-
- ret = join_consumer_thread(&ustconsumer32_data);
- if (ret) {
- errno = ret;
- PERROR("join_consumer ust32");
- }
-
- ret = join_consumer_thread(&ustconsumer64_data);
- if (ret) {
- errno = ret;
- PERROR("join_consumer ust64");
- }
- return NULL;
-}
-
-
-/*
- * usage function on stderr
- */
-static void usage(void)
-{
- fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname);
- fprintf(stderr, " -h, --help Display this usage.\n");
- fprintf(stderr, " -c, --client-sock PATH Specify path for the client unix socket\n");
- fprintf(stderr, " -a, --apps-sock PATH Specify path for apps unix socket\n");
- fprintf(stderr, " --kconsumerd-err-sock PATH Specify path for the kernel consumer error socket\n");
- fprintf(stderr, " --kconsumerd-cmd-sock PATH Specify path for the kernel consumer command socket\n");
- fprintf(stderr, " --ustconsumerd32-err-sock PATH Specify path for the 32-bit UST consumer error socket\n");
- fprintf(stderr, " --ustconsumerd64-err-sock PATH Specify path for the 64-bit UST consumer error socket\n");
- fprintf(stderr, " --ustconsumerd32-cmd-sock PATH Specify path for the 32-bit UST consumer command socket\n");
- fprintf(stderr, " --ustconsumerd64-cmd-sock PATH Specify path for the 64-bit UST consumer command socket\n");
- fprintf(stderr, " --consumerd32-path PATH Specify path for the 32-bit UST consumer daemon binary\n");
- fprintf(stderr, " --consumerd32-libdir PATH Specify path for the 32-bit UST consumer daemon libraries\n");
- fprintf(stderr, " --consumerd64-path PATH Specify path for the 64-bit UST consumer daemon binary\n");
- fprintf(stderr, " --consumerd64-libdir PATH Specify path for the 64-bit UST consumer daemon libraries\n");
- fprintf(stderr, " -d, --daemonize Start as a daemon.\n");
- fprintf(stderr, " -b, --background Start as a daemon, keeping console open.\n");
- fprintf(stderr, " -g, --group NAME Specify the tracing group name. (default: tracing)\n");
- fprintf(stderr, " -V, --version Show version number.\n");
- fprintf(stderr, " -S, --sig-parent Send SIGUSR1 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, " -p, --pidfile FILE Write a pid to FILE name overriding the default value.\n");
- fprintf(stderr, " --verbose-consumer Verbose mode for consumer. Activate DBG() macro.\n");
- fprintf(stderr, " --no-kernel Disable kernel tracer\n");
- fprintf(stderr, " --agent-tcp-port Agent registration TCP port\n");
- fprintf(stderr, " -f --config PATH Load daemon configuration file\n");
- fprintf(stderr, " -l --load PATH Load session configuration\n");
- fprintf(stderr, " --kmod-probes Specify kernel module probes to load\n");
- fprintf(stderr, " --extra-kmod-probes Specify extra kernel module probes to load\n");
-}
-
-static int string_match(const char *str1, const char *str2)
-{
- return (str1 && str2) && !strcmp(str1, str2);
-}
-
-/*
- * Take an option from the getopt output and set it in the right variable to be
- * used later.
- *
- * Return 0 on success else a negative value.
- */
-static int set_option(int opt, const char *arg, const char *optname)
-{
- int ret = 0;
-
- if (arg && arg[0] == '\0') {
- /*
- * This only happens if the value is read from daemon config
- * file. This means the option requires an argument and the
- * configuration file contains a line such as:
- * my_option =
- */
- ret = -EINVAL;
- goto end;
- }
+ int ret = 0;
if (string_match(optname, "client-sock") || opt == 'c') {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-c, --client-sock");
} else {
- snprintf(client_unix_sock_path, PATH_MAX, "%s", arg);
+ config_string_set(&config.client_unix_sock_path,
+ strdup(arg));
+ if (!config.client_unix_sock_path.value) {
+ ret = -ENOMEM;
+ PERROR("strdup");
+ }
}
} else if (string_match(optname, "apps-sock") || opt == 'a') {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-a, --apps-sock");
} else {
- snprintf(apps_unix_sock_path, PATH_MAX, "%s", arg);
+ config_string_set(&config.apps_unix_sock_path,
+ strdup(arg));
+ if (!config.apps_unix_sock_path.value) {
+ ret = -ENOMEM;
+ PERROR("strdup");
+ }
}
} else if (string_match(optname, "daemonize") || opt == 'd') {
- opt_daemon = 1;
+ config.daemonize = true;
} else if (string_match(optname, "background") || opt == 'b') {
- opt_background = 1;
+ config.background = true;
} else if (string_match(optname, "group") || opt == 'g') {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-g, --group");
} else {
- /*
- * If the override option is set, the pointer points to a
- * *non* const thus freeing it even though the variable type is
- * set to const.
- */
- if (tracing_group_name_override) {
- free((void *) tracing_group_name);
- }
- tracing_group_name = strdup(arg);
- if (!tracing_group_name) {
- PERROR("strdup");
+ config_string_set(&config.tracing_group_name,
+ strdup(arg));
+ if (!config.tracing_group_name.value) {
ret = -ENOMEM;
+ PERROR("strdup");
}
- tracing_group_name_override = 1;
}
} else if (string_match(optname, "help") || opt == 'h') {
- usage();
- exit(EXIT_SUCCESS);
+ ret = utils_show_help(8, "lttng-sessiond", help_msg);
+ if (ret) {
+ ERR("Cannot show --help for `lttng-sessiond`");
+ perror("exec");
+ }
+ exit(ret ? EXIT_FAILURE : EXIT_SUCCESS);
} else if (string_match(optname, "version") || opt == 'V') {
fprintf(stdout, "%s\n", VERSION);
exit(EXIT_SUCCESS);
} else if (string_match(optname, "sig-parent") || opt == 'S') {
- opt_sig_parent = 1;
+ config.sig_parent = true;
} else if (string_match(optname, "kconsumerd-err-sock")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--kconsumerd-err-sock");
} else {
- snprintf(kconsumer_data.err_unix_sock_path, PATH_MAX, "%s", arg);
+ config_string_set(&config.kconsumerd_err_unix_sock_path,
+ strdup(arg));
+ if (!config.kconsumerd_err_unix_sock_path.value) {
+ ret = -ENOMEM;
+ PERROR("strdup");
+ }
}
} else if (string_match(optname, "kconsumerd-cmd-sock")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--kconsumerd-cmd-sock");
} else {
- snprintf(kconsumer_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
+ config_string_set(&config.kconsumerd_cmd_unix_sock_path,
+ strdup(arg));
+ if (!config.kconsumerd_cmd_unix_sock_path.value) {
+ ret = -ENOMEM;
+ PERROR("strdup");
+ }
}
} else if (string_match(optname, "ustconsumerd64-err-sock")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--ustconsumerd64-err-sock");
} else {
- snprintf(ustconsumer64_data.err_unix_sock_path, PATH_MAX, "%s", arg);
+ config_string_set(&config.consumerd64_err_unix_sock_path,
+ strdup(arg));
+ if (!config.consumerd64_err_unix_sock_path.value) {
+ ret = -ENOMEM;
+ PERROR("strdup");
+ }
}
} else if (string_match(optname, "ustconsumerd64-cmd-sock")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--ustconsumerd64-cmd-sock");
} else {
- snprintf(ustconsumer64_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
+ config_string_set(&config.consumerd64_cmd_unix_sock_path,
+ strdup(arg));
+ if (!config.consumerd64_cmd_unix_sock_path.value) {
+ ret = -ENOMEM;
+ PERROR("strdup");
+ }
}
} else if (string_match(optname, "ustconsumerd32-err-sock")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--ustconsumerd32-err-sock");
} else {
- snprintf(ustconsumer32_data.err_unix_sock_path, PATH_MAX, "%s", arg);
+ config_string_set(&config.consumerd32_err_unix_sock_path,
+ strdup(arg));
+ if (!config.consumerd32_err_unix_sock_path.value) {
+ ret = -ENOMEM;
+ PERROR("strdup");
+ }
}
} else if (string_match(optname, "ustconsumerd32-cmd-sock")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--ustconsumerd32-cmd-sock");
} else {
- snprintf(ustconsumer32_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
+ config_string_set(&config.consumerd32_cmd_unix_sock_path,
+ strdup(arg));
+ if (!config.consumerd32_cmd_unix_sock_path.value) {
+ ret = -ENOMEM;
+ PERROR("strdup");
+ }
}
} else if (string_match(optname, "no-kernel")) {
- opt_no_kernel = 1;
+ config.no_kernel = true;
} else if (string_match(optname, "quiet") || opt == 'q') {
- lttng_opt_quiet = 1;
+ config.quiet = true;
} else if (string_match(optname, "verbose") || opt == 'v') {
/* Verbose level can increase using multiple -v */
if (arg) {
/* Value obtained from config file */
- lttng_opt_verbose = config_parse_value(arg);
+ config.verbose = config_parse_value(arg);
} else {
/* -v used on command line */
- lttng_opt_verbose++;
+ config.verbose++;
}
/* Clamp value to [0, 3] */
- lttng_opt_verbose = lttng_opt_verbose < 0 ? 0 :
- (lttng_opt_verbose <= 3 ? lttng_opt_verbose : 3);
+ config.verbose = config.verbose < 0 ? 0 :
+ (config.verbose <= 3 ? config.verbose : 3);
} else if (string_match(optname, "verbose-consumer")) {
if (arg) {
- opt_verbose_consumer = config_parse_value(arg);
+ config.verbose_consumer = config_parse_value(arg);
} else {
- opt_verbose_consumer += 1;
+ config.verbose_consumer++;
}
} else if (string_match(optname, "consumerd32-path")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--consumerd32-path");
} else {
- if (consumerd32_bin_override) {
- free((void *) consumerd32_bin);
- }
- consumerd32_bin = strdup(arg);
- if (!consumerd32_bin) {
+ config_string_set(&config.consumerd32_bin_path,
+ strdup(arg));
+ if (!config.consumerd32_bin_path.value) {
PERROR("strdup");
ret = -ENOMEM;
}
- consumerd32_bin_override = 1;
}
} else if (string_match(optname, "consumerd32-libdir")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--consumerd32-libdir");
} else {
- if (consumerd32_libdir_override) {
- free((void *) consumerd32_libdir);
- }
- consumerd32_libdir = strdup(arg);
- if (!consumerd32_libdir) {
+ config_string_set(&config.consumerd32_lib_dir,
+ strdup(arg));
+ if (!config.consumerd32_lib_dir.value) {
PERROR("strdup");
ret = -ENOMEM;
}
- consumerd32_libdir_override = 1;
}
} else if (string_match(optname, "consumerd64-path")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--consumerd64-path");
} else {
- if (consumerd64_bin_override) {
- free((void *) consumerd64_bin);
- }
- consumerd64_bin = strdup(arg);
- if (!consumerd64_bin) {
+ config_string_set(&config.consumerd64_bin_path,
+ strdup(arg));
+ if (!config.consumerd64_bin_path.value) {
PERROR("strdup");
ret = -ENOMEM;
}
- consumerd64_bin_override = 1;
}
} else if (string_match(optname, "consumerd64-libdir")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--consumerd64-libdir");
} else {
- if (consumerd64_libdir_override) {
- free((void *) consumerd64_libdir);
- }
- consumerd64_libdir = strdup(arg);
- if (!consumerd64_libdir) {
+ config_string_set(&config.consumerd64_lib_dir,
+ strdup(arg));
+ if (!config.consumerd64_lib_dir.value) {
PERROR("strdup");
ret = -ENOMEM;
}
- consumerd64_libdir_override = 1;
}
} else if (string_match(optname, "pidfile") || opt == 'p') {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-p, --pidfile");
} else {
- free(opt_pidfile);
- opt_pidfile = strdup(arg);
- if (!opt_pidfile) {
+ config_string_set(&config.pid_file_path, strdup(arg));
+ if (!config.pid_file_path.value) {
PERROR("strdup");
ret = -ENOMEM;
}
}
} else if (string_match(optname, "agent-tcp-port")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--agent-tcp-port");
} else {
unsigned long v;
- if (!arg) {
- ret = -EINVAL;
- goto end;
- }
errno = 0;
v = strtoul(arg, NULL, 0);
if (errno != 0 || !isdigit(arg[0])) {
ERR("Port overflow in --agent-tcp-port parameter: %s", arg);
return -1;
}
- agent_tcp_port = (uint32_t) v;
- DBG3("Agent TCP port set to non default: %u", agent_tcp_port);
+ config.agent_tcp_port.begin = config.agent_tcp_port.end = (int) v;
+ DBG3("Agent TCP port set to non default: %i", (int) v);
}
} else if (string_match(optname, "load") || opt == 'l') {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-l, --load");
} else {
- free(opt_load_session_path);
- opt_load_session_path = strdup(arg);
- if (!opt_load_session_path) {
+ config_string_set(&config.load_session_path, strdup(arg));
+ if (!config.load_session_path.value) {
PERROR("strdup");
ret = -ENOMEM;
}
}
} else if (string_match(optname, "kmod-probes")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--kmod-probes");
} else {
- free(kmod_probes_list);
- kmod_probes_list = strdup(arg);
- if (!kmod_probes_list) {
+ config_string_set(&config.kmod_probes_list, strdup(arg));
+ if (!config.kmod_probes_list.value) {
PERROR("strdup");
ret = -ENOMEM;
}
}
} else if (string_match(optname, "extra-kmod-probes")) {
+ if (!arg || *arg == '\0') {
+ ret = -EINVAL;
+ goto end;
+ }
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--extra-kmod-probes");
} else {
- free(kmod_extra_probes_list);
- kmod_extra_probes_list = strdup(arg);
- if (!kmod_extra_probes_list) {
+ config_string_set(&config.kmod_extra_probes_list,
+ strdup(arg));
+ if (!config.kmod_extra_probes_list.value) {
PERROR("strdup");
ret = -ENOMEM;
}
}
/*
- * 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).
+ * Creates the application socket.
*/
static int init_daemon_socket(void)
{
old_umask = umask(0);
- /* Create client tool unix socket */
- client_sock = lttcomm_create_unix_sock(client_unix_sock_path);
- if (client_sock < 0) {
- ERR("Create unix sock failed: %s", client_unix_sock_path);
- ret = -1;
- goto end;
- }
-
- /* Set the cloexec flag */
- ret = utils_set_fd_cloexec(client_sock);
- if (ret < 0) {
- ERR("Unable to set CLOEXEC flag to the client Unix socket (fd: %d). "
- "Continuing but note that the consumer daemon will have a "
- "reference to this socket on exec()", client_sock);
- }
-
- /* File permission MUST be 660 */
- ret = chmod(client_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
- if (ret < 0) {
- ERR("Set file permissions failed: %s", client_unix_sock_path);
- PERROR("chmod");
- goto end;
- }
-
/* Create the application unix socket */
- apps_sock = lttcomm_create_unix_sock(apps_unix_sock_path);
+ apps_sock = lttcomm_create_unix_sock(config.apps_unix_sock_path.value);
if (apps_sock < 0) {
- ERR("Create unix sock failed: %s", apps_unix_sock_path);
+ ERR("Create unix sock failed: %s", config.apps_unix_sock_path.value);
ret = -1;
goto end;
}
}
/* File permission MUST be 666 */
- ret = chmod(apps_unix_sock_path,
+ ret = chmod(config.apps_unix_sock_path.value,
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);
+ ERR("Set file permissions failed: %s", config.apps_unix_sock_path.value);
PERROR("chmod");
goto end;
}
- DBG3("Session daemon client socket %d and application socket %d created",
- client_sock, apps_sock);
+ DBG3("Session daemon application socket %d created",
+ apps_sock);
end:
umask(old_umask);
return ret;
}
+/*
+ * Create lockfile using the rundir and return its fd.
+ */
+static int create_lockfile(void)
+{
+ return utils_create_lock_file(config.lock_file_path.value);
+}
+
/*
* Check if the global socket is available, and if a daemon is answering at the
* other side. If yes, error is returned.
+ *
+ * Also attempts to create and hold the lock file.
*/
static int check_existing_daemon(void)
{
+ int ret = 0;
+
/* Is there anybody out there ? */
if (lttng_session_daemon_alive()) {
- return -EEXIST;
+ ret = -EEXIST;
+ goto end;
}
- return 0;
+ lockfile_fd = create_lockfile();
+ if (lockfile_fd < 0) {
+ ret = -EEXIST;
+ goto end;
+ }
+end:
+ return ret;
+}
+
+static void sessiond_cleanup_lock_file(void)
+{
+ int ret;
+
+ /*
+ * Cleanup lock file by deleting it and finaly closing it which will
+ * release the file system lock.
+ */
+ if (lockfile_fd >= 0) {
+ ret = remove(config.lock_file_path.value);
+ if (ret < 0) {
+ PERROR("remove lock file");
+ }
+ ret = close(lockfile_fd);
+ if (ret < 0) {
+ PERROR("close lock file");
+ }
+ }
}
/*
int ret;
gid_t gid;
- gid = utils_get_group_id(tracing_group_name);
+ gid = utils_get_group_id(config.tracing_group_name.value);
/* Set lttng run dir */
ret = chown(rundir, 0, gid);
}
/* lttng client socket path */
- ret = chown(client_unix_sock_path, 0, gid);
+ ret = chown(config.client_unix_sock_path.value, 0, gid);
if (ret < 0) {
- ERR("Unable to set group on %s", client_unix_sock_path);
+ ERR("Unable to set group on %s", config.client_unix_sock_path.value);
PERROR("chown");
}
/*
* Create the lttng run directory needed for all global sockets and pipe.
*/
-static int create_lttng_rundir(const char *rundir)
+static int create_lttng_rundir(void)
{
int ret;
- DBG3("Creating LTTng run directory: %s", rundir);
+ DBG3("Creating LTTng run directory: %s", config.rundir.value);
- ret = mkdir(rundir, S_IRWXU);
+ ret = mkdir(config.rundir.value, S_IRWXU);
if (ret < 0) {
if (errno != EEXIST) {
- ERR("Unable to create %s", rundir);
+ ERR("Unable to create %s", config.rundir.value);
goto error;
} else {
ret = 0;
}
/*
- * Setup sockets and directory needed by the kconsumerd communication with the
+ * Setup sockets and directory needed by the consumerds' communication with the
* session daemon.
*/
-static int set_consumer_sockets(struct consumer_data *consumer_data,
- const char *rundir)
+static int set_consumer_sockets(struct consumer_data *consumer_data)
{
int ret;
- char path[PATH_MAX];
+ char *path = NULL;
switch (consumer_data->type) {
case LTTNG_CONSUMER_KERNEL:
- snprintf(path, PATH_MAX, DEFAULT_KCONSUMERD_PATH, rundir);
+ path = config.kconsumerd_path.value;
break;
case LTTNG_CONSUMER64_UST:
- snprintf(path, PATH_MAX, DEFAULT_USTCONSUMERD64_PATH, rundir);
+ path = config.consumerd64_path.value;
break;
case LTTNG_CONSUMER32_UST:
- snprintf(path, PATH_MAX, DEFAULT_USTCONSUMERD32_PATH, rundir);
+ path = config.consumerd32_path.value;
break;
default:
ERR("Consumer type unknown");
ret = -EINVAL;
goto error;
}
+ assert(path);
DBG2("Creating consumer directory: %s", path);
ret = mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP);
- if (ret < 0) {
- if (errno != EEXIST) {
- PERROR("mkdir");
- ERR("Failed to create %s", path);
- goto error;
- }
- ret = -1;
+ if (ret < 0 && errno != EEXIST) {
+ PERROR("mkdir");
+ ERR("Failed to create %s", path);
+ goto error;
}
if (is_root) {
- ret = chown(path, 0, utils_get_group_id(tracing_group_name));
+ ret = chown(path, 0, utils_get_group_id(config.tracing_group_name.value));
if (ret < 0) {
ERR("Unable to set group on %s", path);
PERROR("chown");
}
}
- /* Create the kconsumerd error unix socket */
+ /* Create the consumerd error unix socket */
consumer_data->err_sock =
lttcomm_create_unix_sock(consumer_data->err_unix_sock_path);
if (consumer_data->err_sock < 0) {
static void sighandler(int sig)
{
switch (sig) {
- case SIGPIPE:
- DBG("SIGPIPE caught");
- return;
case SIGINT:
DBG("SIGINT caught");
stop_threads();
return ret;
}
- sa.sa_handler = sighandler;
sa.sa_mask = sigset;
sa.sa_flags = 0;
+
+ sa.sa_handler = sighandler;
if ((ret = sigaction(SIGTERM, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
return ret;
}
- if ((ret = sigaction(SIGPIPE, &sa, NULL)) < 0) {
+ if ((ret = sigaction(SIGUSR1, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
}
- if ((ret = sigaction(SIGUSR1, &sa, NULL)) < 0) {
+ sa.sa_handler = SIG_IGN;
+ if ((ret = sigaction(SIGPIPE, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
}
/*
* Set open files limit to unlimited. This daemon can open a large number of
- * file descriptors in order to consumer multiple kernel traces.
+ * file descriptors in order to consume multiple kernel traces.
*/
static void set_ulimit(void)
{
int ret;
struct rlimit lim;
- /* The kernel does not allowed an infinite limit for open files */
+ /* The kernel does not allow an infinite limit for open files */
lim.rlim_cur = 65535;
lim.rlim_max = 65535;
}
}
-/*
- * Write pidfile using the rundir and opt_pidfile.
- */
static int write_pidfile(void)
{
- int ret;
- char pidfile_path[PATH_MAX];
-
- assert(rundir);
-
- if (opt_pidfile) {
- strncpy(pidfile_path, opt_pidfile, sizeof(pidfile_path));
- } else {
- /* Build pidfile path from rundir and opt_pidfile. */
- ret = snprintf(pidfile_path, sizeof(pidfile_path), "%s/"
- DEFAULT_LTTNG_SESSIOND_PIDFILE, rundir);
- if (ret < 0) {
- PERROR("snprintf pidfile path");
- goto error;
- }
- }
-
- /*
- * Create pid file in rundir.
- */
- ret = utils_create_pid_file(getpid(), pidfile_path);
-error:
- return ret;
+ return utils_create_pid_file(getpid(), config.pid_file_path.value);
}
-/*
- * Create lockfile using the rundir and return its fd.
- */
-static int create_lockfile(void)
+static int set_clock_plugin_env(void)
{
- int ret;
- char lockfile_path[PATH_MAX];
+ int ret = 0;
+ char *env_value = NULL;
+
+ if (!config.lttng_ust_clock_plugin.value) {
+ goto end;
+ }
- ret = generate_lock_file_path(lockfile_path, sizeof(lockfile_path));
+ ret = asprintf(&env_value, "LTTNG_UST_CLOCK_PLUGIN=%s",
+ config.lttng_ust_clock_plugin.value);
if (ret < 0) {
- goto error;
+ PERROR("asprintf");
+ goto end;
}
- ret = utils_create_lock_file(lockfile_path);
-error:
+ ret = putenv(env_value);
+ if (ret) {
+ free(env_value);
+ PERROR("putenv of LTTNG_UST_CLOCK_PLUGIN");
+ goto end;
+ }
+
+ DBG("Updated LTTNG_UST_CLOCK_PLUGIN environment variable to \"%s\"",
+ config.lttng_ust_clock_plugin.value);
+end:
return ret;
}
-/*
- * Write agent TCP port using the rundir.
- */
-static int write_agent_port(void)
+static void destroy_all_sessions_and_wait(void)
{
- int ret;
- char path[PATH_MAX];
+ struct ltt_session *session, *tmp;
+ struct ltt_session_list *session_list;
- assert(rundir);
+ session_list = session_get_list();
+ DBG("Initiating destruction of all sessions");
- ret = snprintf(path, sizeof(path), "%s/"
- DEFAULT_LTTNG_SESSIOND_AGENTPORT_FILE, rundir);
- if (ret < 0) {
- PERROR("snprintf agent port path");
- goto error;
+ if (!session_list) {
+ return;
}
- /*
- * Create TCP agent port file in rundir.
- */
- ret = utils_create_pid_file(agent_tcp_port, path);
+ session_lock_list();
+ /* Initiate the destruction of all sessions. */
+ cds_list_for_each_entry_safe(session, tmp,
+ &session_list->head, list) {
+ if (!session_get(session)) {
+ continue;
+ }
-error:
- return ret;
+ session_lock(session);
+ if (session->destroyed) {
+ goto unlock_session;
+ }
+ (void) cmd_destroy_session(session,
+ notification_thread_handle);
+ unlock_session:
+ session_unlock(session);
+ session_put(session);
+ }
+ session_unlock_list();
+
+ /* Wait for the destruction of all sessions to complete. */
+ DBG("Waiting for the destruction of all sessions to complete");
+ session_list_wait_empty();
+ DBG("Destruction of all sessions completed");
}
/*
{
int ret = 0, retval = 0;
void *status;
- const char *home_path, *env_app_timeout;
+ const char *env_app_timeout;
+ struct lttng_pipe *ust32_channel_monitor_pipe = NULL,
+ *ust64_channel_monitor_pipe = NULL,
+ *kernel_channel_monitor_pipe = NULL;
+ struct lttng_thread *ht_cleanup_thread = NULL;
+ struct timer_thread_parameters timer_thread_parameters;
+ /* Rotation thread handle. */
+ struct rotation_thread_handle *rotation_thread_handle = NULL;
+ /* Queue of rotation jobs populated by the sessiond-timer. */
+ struct rotation_thread_timer_queue *rotation_timer_queue = NULL;
+ struct lttng_thread *client_thread = NULL;
init_kernel_workarounds();
goto exit_set_signal_handler;
}
- setup_consumerd_path();
+ if (timer_signal_init()) {
+ retval = -1;
+ goto exit_set_signal_handler;
+ }
page_size = sysconf(_SC_PAGESIZE);
if (page_size < 0) {
WARN("Fallback page size to %ld", page_size);
}
+ ret = sessiond_config_init(&config);
+ if (ret) {
+ retval = -1;
+ goto exit_set_signal_handler;
+ }
+
+ /*
+ * Init config from environment variables.
+ * Command line option override env configuration per-doc. Do env first.
+ */
+ sessiond_config_apply_env_config(&config);
+
/*
* Parse arguments and load the daemon configuration file.
*
goto exit_options;
}
+ /*
+ * Resolve all paths received as arguments, configuration option, or
+ * through environment variable as absolute paths. This is necessary
+ * since daemonizing causes the sessiond's current working directory
+ * to '/'.
+ */
+ ret = sessiond_config_resolve_paths(&config);
+ if (ret) {
+ goto exit_options;
+ }
+
+ /* Apply config. */
+ lttng_opt_verbose = config.verbose;
+ lttng_opt_quiet = config.quiet;
+ kconsumer_data.err_unix_sock_path =
+ config.kconsumerd_err_unix_sock_path.value;
+ kconsumer_data.cmd_unix_sock_path =
+ config.kconsumerd_cmd_unix_sock_path.value;
+ ustconsumer32_data.err_unix_sock_path =
+ config.consumerd32_err_unix_sock_path.value;
+ ustconsumer32_data.cmd_unix_sock_path =
+ config.consumerd32_cmd_unix_sock_path.value;
+ ustconsumer64_data.err_unix_sock_path =
+ config.consumerd64_err_unix_sock_path.value;
+ ustconsumer64_data.cmd_unix_sock_path =
+ config.consumerd64_cmd_unix_sock_path.value;
+ set_clock_plugin_env();
+
+ sessiond_config_log(&config);
+
+ if (create_lttng_rundir()) {
+ retval = -1;
+ goto exit_options;
+ }
+
+ /* Abort launch if a session daemon is already running. */
+ if (check_existing_daemon()) {
+ ERR("A session daemon is already running.");
+ retval = -1;
+ goto exit_options;
+ }
+
/* Daemonize */
- if (opt_daemon || opt_background) {
+ if (config.daemonize || config.background) {
int i;
ret = lttng_daemonize(&child_ppid, &recv_child_signal,
- !opt_background);
+ !config.background);
if (ret < 0) {
retval = -1;
goto exit_options;
/*
* We are in the child. Make sure all other file descriptors are
* closed, in case we are called with more opened file
- * descriptors than the standard ones.
+ * descriptors than the standard ones and the lock file.
*/
for (i = 3; i < sysconf(_SC_OPEN_MAX); i++) {
+ if (i == lockfile_fd) {
+ continue;
+ }
(void) close(i);
}
}
goto exit_health_sessiond_cleanup;
}
- if (init_ht_cleanup_quit_pipe()) {
- retval = -1;
- goto exit_ht_cleanup_quit_pipe;
- }
-
- /* Setup the thread ht_cleanup communication pipe. */
- if (utils_create_pipe_cloexec(ht_cleanup_pipe)) {
- retval = -1;
- goto exit_ht_cleanup_pipe;
- }
-
- /* Set up max poll set size */
- if (lttng_poll_set_max_size()) {
- retval = -1;
- goto exit_set_max_size;
- }
-
/* Create thread to clean up RCU hash tables */
- ret = pthread_create(&ht_cleanup_thread, NULL,
- thread_ht_cleanup, (void *) NULL);
- if (ret) {
- errno = ret;
- PERROR("pthread_create ht_cleanup");
+ ht_cleanup_thread = launch_ht_cleanup_thread();
+ if (!ht_cleanup_thread) {
retval = -1;
goto exit_ht_cleanup;
}
/* Create thread quit pipe */
- if (init_thread_quit_pipe()) {
+ if (sessiond_init_thread_quit_pipe()) {
retval = -1;
goto exit_init_data;
}
/* Check if daemon is UID = 0 */
is_root = !getuid();
-
if (is_root) {
- rundir = strdup(DEFAULT_LTTNG_RUNDIR);
- if (!rundir) {
- retval = -1;
- goto exit_init_data;
- }
-
/* Create global run dir with root access */
- if (create_lttng_rundir(rundir)) {
- retval = -1;
- goto exit_init_data;
- }
-
- if (strlen(apps_unix_sock_path) == 0) {
- ret = snprintf(apps_unix_sock_path, PATH_MAX,
- DEFAULT_GLOBAL_APPS_UNIX_SOCK);
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
- }
-
- if (strlen(client_unix_sock_path) == 0) {
- ret = snprintf(client_unix_sock_path, PATH_MAX,
- DEFAULT_GLOBAL_CLIENT_UNIX_SOCK);
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
- }
-
- /* Set global SHM for ust */
- if (strlen(wait_shm_path) == 0) {
- ret = snprintf(wait_shm_path, PATH_MAX,
- DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH);
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
- }
-
- if (strlen(health_unix_sock_path) == 0) {
- ret = snprintf(health_unix_sock_path,
- sizeof(health_unix_sock_path),
- DEFAULT_GLOBAL_HEALTH_UNIX_SOCK);
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
- }
-
- /* Setup kernel consumerd path */
- ret = snprintf(kconsumer_data.err_unix_sock_path, PATH_MAX,
- DEFAULT_KCONSUMERD_ERR_SOCK_PATH, rundir);
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
- ret = snprintf(kconsumer_data.cmd_unix_sock_path, PATH_MAX,
- DEFAULT_KCONSUMERD_CMD_SOCK_PATH, rundir);
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
-
- DBG2("Kernel consumer err path: %s",
- kconsumer_data.err_unix_sock_path);
- DBG2("Kernel consumer cmd path: %s",
- kconsumer_data.cmd_unix_sock_path);
- } else {
- home_path = utils_get_home_dir();
- if (home_path == NULL) {
- /* TODO: Add --socket PATH option */
- ERR("Can't get HOME directory for sockets creation.");
- retval = -1;
- goto exit_init_data;
- }
- /*
- * Create rundir from home path. This will create something like
- * $HOME/.lttng
- */
- ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
- if (ret < 0) {
+ kernel_channel_monitor_pipe = lttng_pipe_open(0);
+ if (!kernel_channel_monitor_pipe) {
+ ERR("Failed to create kernel consumer channel monitor pipe");
retval = -1;
goto exit_init_data;
}
-
- if (create_lttng_rundir(rundir)) {
+ kconsumer_data.channel_monitor_pipe =
+ lttng_pipe_release_writefd(
+ kernel_channel_monitor_pipe);
+ if (kconsumer_data.channel_monitor_pipe < 0) {
retval = -1;
goto exit_init_data;
}
-
- if (strlen(apps_unix_sock_path) == 0) {
- ret = snprintf(apps_unix_sock_path, PATH_MAX,
- DEFAULT_HOME_APPS_UNIX_SOCK,
- home_path);
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
- }
-
- /* Set the cli tool unix socket path */
- if (strlen(client_unix_sock_path) == 0) {
- ret = snprintf(client_unix_sock_path, PATH_MAX,
- DEFAULT_HOME_CLIENT_UNIX_SOCK,
- home_path);
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
- }
-
- /* Set global SHM for ust */
- if (strlen(wait_shm_path) == 0) {
- ret = snprintf(wait_shm_path, PATH_MAX,
- DEFAULT_HOME_APPS_WAIT_SHM_PATH,
- getuid());
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
- }
-
- /* Set health check Unix path */
- if (strlen(health_unix_sock_path) == 0) {
- ret = snprintf(health_unix_sock_path,
- sizeof(health_unix_sock_path),
- DEFAULT_HOME_HEALTH_UNIX_SOCK,
- home_path);
- if (ret < 0) {
- retval = -1;
- goto exit_init_data;
- }
- }
- }
-
- lockfile_fd = create_lockfile();
- if (lockfile_fd < 0) {
- retval = -1;
- goto exit_init_data;
}
/* Set consumer initial state */
kernel_consumerd_state = CONSUMER_STOPPED;
ust_consumerd_state = CONSUMER_STOPPED;
- DBG("Client socket path %s", client_unix_sock_path);
- DBG("Application socket path %s", apps_unix_sock_path);
- DBG("Application wait path %s", wait_shm_path);
- DBG("LTTng run directory path: %s", rundir);
-
- /* 32 bits consumerd path setup */
- ret = snprintf(ustconsumer32_data.err_unix_sock_path, PATH_MAX,
- DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH, rundir);
- if (ret < 0) {
- PERROR("snprintf 32-bit consumer error socket path");
+ ust32_channel_monitor_pipe = lttng_pipe_open(0);
+ if (!ust32_channel_monitor_pipe) {
+ ERR("Failed to create 32-bit user space consumer channel monitor pipe");
retval = -1;
goto exit_init_data;
}
- ret = snprintf(ustconsumer32_data.cmd_unix_sock_path, PATH_MAX,
- DEFAULT_USTCONSUMERD32_CMD_SOCK_PATH, rundir);
- if (ret < 0) {
- PERROR("snprintf 32-bit consumer command socket path");
+ ustconsumer32_data.channel_monitor_pipe = lttng_pipe_release_writefd(
+ ust32_channel_monitor_pipe);
+ if (ustconsumer32_data.channel_monitor_pipe < 0) {
retval = -1;
goto exit_init_data;
}
- DBG2("UST consumer 32 bits err path: %s",
- ustconsumer32_data.err_unix_sock_path);
- DBG2("UST consumer 32 bits cmd path: %s",
- ustconsumer32_data.cmd_unix_sock_path);
-
- /* 64 bits consumerd path setup */
- ret = snprintf(ustconsumer64_data.err_unix_sock_path, PATH_MAX,
- DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH, rundir);
- if (ret < 0) {
- PERROR("snprintf 64-bit consumer error socket path");
+ /*
+ * The rotation_thread_timer_queue structure is shared between the
+ * sessiond timer thread and the rotation thread. The main thread keeps
+ * its ownership and destroys it when both threads have been joined.
+ */
+ rotation_timer_queue = rotation_thread_timer_queue_create();
+ if (!rotation_timer_queue) {
retval = -1;
goto exit_init_data;
}
- ret = snprintf(ustconsumer64_data.cmd_unix_sock_path, PATH_MAX,
- DEFAULT_USTCONSUMERD64_CMD_SOCK_PATH, rundir);
- if (ret < 0) {
- PERROR("snprintf 64-bit consumer command socket path");
+ timer_thread_parameters.rotation_thread_job_queue =
+ rotation_timer_queue;
+
+ ust64_channel_monitor_pipe = lttng_pipe_open(0);
+ if (!ust64_channel_monitor_pipe) {
+ ERR("Failed to create 64-bit user space consumer channel monitor pipe");
retval = -1;
goto exit_init_data;
}
-
- DBG2("UST consumer 64 bits err path: %s",
- ustconsumer64_data.err_unix_sock_path);
- DBG2("UST consumer 64 bits cmd path: %s",
- ustconsumer64_data.cmd_unix_sock_path);
-
- /*
- * See if daemon already exist.
- */
- if (check_existing_daemon()) {
- ERR("Already running daemon.\n");
- /*
- * We do not goto exit because we must not cleanup()
- * because a daemon is already running.
- */
+ ustconsumer64_data.channel_monitor_pipe = lttng_pipe_release_writefd(
+ ust64_channel_monitor_pipe);
+ if (ustconsumer64_data.channel_monitor_pipe < 0) {
retval = -1;
goto exit_init_data;
}
* kernel tracer.
*/
if (is_root) {
- if (set_consumer_sockets(&kconsumer_data, rundir)) {
+ if (set_consumer_sockets(&kconsumer_data)) {
retval = -1;
goto exit_init_data;
}
/* Setup kernel tracer */
- if (!opt_no_kernel) {
+ if (!config.no_kernel) {
init_kernel_tracer();
if (kernel_tracer_fd >= 0) {
ret = syscall_init_table();
/* init lttng_fd tracking must be done after set_ulimit. */
lttng_fd_init();
- if (set_consumer_sockets(&ustconsumer64_data, rundir)) {
+ if (set_consumer_sockets(&ustconsumer64_data)) {
retval = -1;
goto exit_init_data;
}
- if (set_consumer_sockets(&ustconsumer32_data, rundir)) {
+ if (set_consumer_sockets(&ustconsumer32_data)) {
retval = -1;
goto exit_init_data;
}
}
/* Set credentials to socket */
- if (is_root && set_permissions(rundir)) {
+ if (is_root && set_permissions(config.rundir.value)) {
retval = -1;
goto exit_init_data;
}
/* Get parent pid if -S, --sig-parent is specified. */
- if (opt_sig_parent) {
+ if (config.sig_parent) {
ppid = getppid();
}
/* Setup the kernel pipe for waking up the kernel thread */
- if (is_root && !opt_no_kernel) {
+ if (is_root && !config.no_kernel) {
if (utils_create_pipe_cloexec(kernel_poll_pipe)) {
retval = -1;
goto exit_init_data;
/* Init UST command queue. */
cds_wfcq_init(&ust_cmd_queue.head, &ust_cmd_queue.tail);
- /*
- * Get session list pointer. This pointer MUST NOT be free'd. This list
- * is statically declared in session.c
- */
- session_list_ptr = session_get_list();
-
cmd_init();
/* Check for the application socket timeout env variable. */
env_app_timeout = getenv(DEFAULT_APP_SOCKET_TIMEOUT_ENV);
if (env_app_timeout) {
- app_socket_timeout = atoi(env_app_timeout);
+ config.app_socket_timeout = atoi(env_app_timeout);
} else {
- app_socket_timeout = DEFAULT_APP_SOCKET_RW_TIMEOUT;
+ config.app_socket_timeout = DEFAULT_APP_SOCKET_RW_TIMEOUT;
}
ret = write_pidfile();
retval = -1;
goto exit_init_data;
}
- ret = write_agent_port();
- if (ret) {
- ERR("Error in write_agent_port");
- retval = -1;
- goto exit_init_data;
- }
/* Initialize communication library */
lttcomm_init();
retval = -1;
goto exit_init_data;
}
- load_info->path = opt_load_session_path;
+ load_info->path = config.load_session_path.value;
- /* Create health-check thread */
- ret = pthread_create(&health_thread, NULL,
- thread_manage_health, (void *) NULL);
- if (ret) {
- errno = ret;
- PERROR("pthread_create health");
+ /* Create health-check thread. */
+ if (!launch_health_management_thread()) {
retval = -1;
goto exit_health;
}
+ /* notification_thread_data acquires the pipes' read side. */
+ notification_thread_handle = notification_thread_handle_create(
+ ust32_channel_monitor_pipe,
+ ust64_channel_monitor_pipe,
+ kernel_channel_monitor_pipe);
+ if (!notification_thread_handle) {
+ retval = -1;
+ ERR("Failed to create notification thread shared data");
+ goto exit_notification;
+ }
+
+ /* Create notification thread. */
+ if (!launch_notification_thread(notification_thread_handle)) {
+ retval = -1;
+ goto exit_notification;
+ }
+
+ /* Create timer thread. */
+ if (!launch_timer_thread(&timer_thread_parameters)) {
+ retval = -1;
+ goto exit_notification;
+ }
+
+ /* rotation_thread_data acquires the pipes' read side. */
+ rotation_thread_handle = rotation_thread_handle_create(
+ rotation_timer_queue,
+ notification_thread_handle);
+ if (!rotation_thread_handle) {
+ retval = -1;
+ ERR("Failed to create rotation thread shared data");
+ stop_threads();
+ goto exit_rotation;
+ }
+
+ /* Create rotation thread. */
+ if (!launch_rotation_thread(rotation_thread_handle)) {
+ retval = -1;
+ goto exit_rotation;
+ }
+
/* Create thread to manage the client socket */
- ret = pthread_create(&client_thread, NULL,
- thread_manage_clients, (void *) NULL);
- if (ret) {
- errno = ret;
- PERROR("pthread_create clients");
+ client_thread = launch_client_thread();
+ if (!client_thread) {
retval = -1;
goto exit_client;
}
/* Create thread to dispatch registration */
- ret = pthread_create(&dispatch_thread, NULL,
+ ret = pthread_create(&dispatch_thread, default_pthread_attr(),
thread_dispatch_ust_registration, (void *) NULL);
if (ret) {
errno = ret;
PERROR("pthread_create dispatch");
retval = -1;
+ stop_threads();
goto exit_dispatch;
}
/* Create thread to manage application registration. */
- ret = pthread_create(®_apps_thread, NULL,
+ ret = pthread_create(®_apps_thread, default_pthread_attr(),
thread_registration_apps, (void *) NULL);
if (ret) {
errno = ret;
PERROR("pthread_create registration");
retval = -1;
+ stop_threads();
goto exit_reg_apps;
}
/* Create thread to manage application socket */
- ret = pthread_create(&apps_thread, NULL,
+ ret = pthread_create(&apps_thread, default_pthread_attr(),
thread_manage_apps, (void *) NULL);
if (ret) {
errno = ret;
PERROR("pthread_create apps");
retval = -1;
+ stop_threads();
goto exit_apps;
}
/* Create thread to manage application notify socket */
- ret = pthread_create(&apps_notify_thread, NULL,
+ ret = pthread_create(&apps_notify_thread, default_pthread_attr(),
ust_thread_manage_notify, (void *) NULL);
if (ret) {
errno = ret;
PERROR("pthread_create notify");
retval = -1;
+ stop_threads();
goto exit_apps_notify;
}
/* Create agent registration thread. */
- ret = pthread_create(&agent_reg_thread, NULL,
+ ret = pthread_create(&agent_reg_thread, default_pthread_attr(),
agent_thread_manage_registration, (void *) NULL);
if (ret) {
errno = ret;
PERROR("pthread_create agent");
retval = -1;
+ stop_threads();
goto exit_agent_reg;
}
/* Don't start this thread if kernel tracing is not requested nor root */
- if (is_root && !opt_no_kernel) {
+ if (is_root && !config.no_kernel) {
/* Create kernel thread to manage kernel event */
- ret = pthread_create(&kernel_thread, NULL,
+ ret = pthread_create(&kernel_thread, default_pthread_attr(),
thread_manage_kernel, (void *) NULL);
if (ret) {
errno = ret;
PERROR("pthread_create kernel");
retval = -1;
+ stop_threads();
goto exit_kernel;
}
}
/* Create session loading thread. */
- ret = pthread_create(&load_session_thread, NULL, thread_load_session,
- load_info);
+ ret = pthread_create(&load_session_thread, default_pthread_attr(),
+ thread_load_session, load_info);
if (ret) {
errno = ret;
PERROR("pthread_create load_session_thread");
retval = -1;
+ stop_threads();
goto exit_load_session;
}
PERROR("pthread_join load_session_thread");
retval = -1;
}
+
+ /* Initiate teardown once activity occurs on the quit pipe. */
+ sessiond_wait_for_quit_pipe(-1U);
+
+ /*
+ * Ensure that the client thread is no longer accepting new commands,
+ * which could cause new sessions to be created.
+ */
+ if (!lttng_thread_shutdown(client_thread)) {
+ ERR("Failed to shutdown the client thread, continuing teardown");
+ lttng_thread_put(client_thread);
+ client_thread = NULL;
+ }
+
+ destroy_all_sessions_and_wait();
exit_load_session:
- if (is_root && !opt_no_kernel) {
+ if (is_root && !config.no_kernel) {
ret = pthread_join(kernel_thread, &status);
if (ret) {
errno = ret;
retval = -1;
}
exit_dispatch:
-
- ret = pthread_join(client_thread, &status);
- if (ret) {
- errno = ret;
- PERROR("pthread_join");
- retval = -1;
- }
exit_client:
-
- ret = pthread_join(health_thread, &status);
- if (ret) {
- errno = ret;
- PERROR("pthread_join health thread");
- retval = -1;
- }
+exit_rotation:
+exit_notification:
+ lttng_thread_list_shutdown_orphans();
exit_health:
-
exit_init_data:
+ if (client_thread) {
+ lttng_thread_put(client_thread);
+ }
+
+ /*
+ * Wait for all pending call_rcu work to complete before tearing
+ * down data structures. call_rcu worker may be trying to
+ * perform lookups in those structures.
+ */
+ rcu_barrier();
/*
* sessiond_cleanup() is called when no other thread is running, except
* the ht_cleanup thread, which is needed to destroy the hash tables.
*/
rcu_thread_online();
sessiond_cleanup();
- rcu_thread_offline();
- rcu_unregister_thread();
- ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
- if (ret < 0) {
- ERR("write error on ht_cleanup quit pipe");
- retval = -1;
- }
+ /*
+ * Ensure all prior call_rcu are done. call_rcu callbacks may push
+ * hash tables to the ht_cleanup thread. Therefore, we ensure that
+ * the queue is empty before shutting down the clean-up thread.
+ */
+ rcu_barrier();
- ret = pthread_join(ht_cleanup_thread, &status);
- if (ret) {
- errno = ret;
- PERROR("pthread_join ht cleanup thread");
- retval = -1;
+ if (ht_cleanup_thread) {
+ lttng_thread_shutdown(ht_cleanup_thread);
+ lttng_thread_put(ht_cleanup_thread);
}
-exit_ht_cleanup:
-exit_set_max_size:
- utils_close_pipe(ht_cleanup_pipe);
-exit_ht_cleanup_pipe:
+ rcu_thread_offline();
+ rcu_unregister_thread();
+
+ if (rotation_thread_handle) {
+ rotation_thread_handle_destroy(rotation_thread_handle);
+ }
/*
- * Close the ht_cleanup quit pipe.
+ * After the rotation and timer thread have quit, we can safely destroy
+ * the rotation_timer_queue.
+ */
+ rotation_thread_timer_queue_destroy(rotation_timer_queue);
+ /*
+ * The teardown of the notification system is performed after the
+ * session daemon's teardown in order to allow it to be notified
+ * of the active session and channels at the moment of the teardown.
*/
- utils_close_pipe(ht_cleanup_quit_pipe);
-exit_ht_cleanup_quit_pipe:
+ if (notification_thread_handle) {
+ notification_thread_handle_destroy(notification_thread_handle);
+ }
+ lttng_pipe_destroy(ust32_channel_monitor_pipe);
+ lttng_pipe_destroy(ust64_channel_monitor_pipe);
+ lttng_pipe_destroy(kernel_channel_monitor_pipe);
+exit_ht_cleanup:
health_app_destroy(health_sessiond);
exit_health_sessiond_cleanup:
exit_create_run_as_worker_cleanup:
exit_options:
- /* Ensure all prior call_rcu are done. */
- rcu_barrier();
-
+ sessiond_cleanup_lock_file();
sessiond_cleanup_options();
exit_set_signal_handler:
-
if (!retval) {
exit(EXIT_SUCCESS);
} else {