/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
#include <getopt.h>
#include <grp.h>
#include <limits.h>
-#include <poll.h>
#include <pthread.h>
#include <semaphore.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/mman.h>
#include <sys/mount.h>
#include <sys/resource.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/wait.h>
+#include <urcu/futex.h>
#include <unistd.h>
#include <ltt-kconsumerd.h>
#include <lttng/lttng-kconsumerd.h>
#include <lttngerr.h>
+#include "compat/poll.h"
#include "context.h"
+#include "futex.h"
#include "kernel-ctl.h"
#include "ltt-sessiond.h"
+#include "shm.h"
#include "traceable-app.h"
#include "ust-ctl.h"
#include "utils.h"
+#include "ust-ctl.h"
/* Const values */
const char default_home_dir[] = DEFAULT_HOME_DIR;
static int is_root; /* Set to 1 if the daemon is running as root */
static pid_t ppid; /* Parent PID for --sig-parent option */
static pid_t kconsumerd_pid;
-static struct pollfd *kernel_pollfd;
+static int dispatch_thread_exit;
static char apps_unix_sock_path[PATH_MAX]; /* Global application Unix socket path */
static char client_unix_sock_path[PATH_MAX]; /* Global client Unix socket path */
static char kconsumerd_err_unix_sock_path[PATH_MAX]; /* kconsumerd error Unix socket path */
static char kconsumerd_cmd_unix_sock_path[PATH_MAX]; /* kconsumerd command Unix socket path */
+static char wait_shm_path[PATH_MAX]; /* global wait shm path for UST */
/* Sockets and FDs */
static int client_sock;
*/
static int thread_quit_pipe[2];
+/*
+ * This pipe is used to inform the thread managing application communication
+ * that a command is queued and ready to be processed.
+ */
+static int apps_cmd_pipe[2];
+
/* Pthread, Mutexes and Semaphores */
static pthread_t kconsumerd_thread;
static pthread_t apps_thread;
+static pthread_t reg_apps_thread;
static pthread_t client_thread;
static pthread_t kernel_thread;
+static pthread_t dispatch_thread;
static sem_t kconsumerd_sem;
-static pthread_mutex_t kconsumerd_pid_mutex; /* Mutex to control kconsumerd pid assignation */
-static int modprobe_remove_kernel_modules(void);
+/* Mutex to control kconsumerd pid assignation */
+static pthread_mutex_t kconsumerd_pid_mutex;
+
+/*
+ * UST registration command queue. This queue is tied with a futex and uses a N
+ * wakers / 1 waiter implemented and detailed in futex.c/.h
+ *
+ * The thread_manage_apps and thread_dispatch_ust_registration interact with
+ * this queue and the wait/wake scheme.
+ */
+static struct ust_cmd_queue ust_cmd_queue;
/*
* Pointer initialized before thread creation.
*/
static struct ltt_session_list *session_list_ptr;
+/*
+ * Create a poll set with O_CLOEXEC and add the thread quit pipe to the set.
+ */
+static int create_thread_poll_set(struct lttng_poll_event *events,
+ unsigned int size)
+{
+ int ret;
+
+ if (events == NULL || size == 0) {
+ ret = -1;
+ goto error;
+ }
+
+ ret = lttng_poll_create(events, size, LTTNG_CLOEXEC);
+ if (ret < 0) {
+ goto error;
+ }
+
+ /* Add quit pipe */
+ ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN);
+ if (ret < 0) {
+ goto error;
+ }
+
+ return 0;
+
+error:
+ return ret;
+}
+
+/*
+ * Check if the thread quit pipe was triggered.
+ *
+ * Return 1 if it was triggered else 0;
+ */
+static int check_thread_quit_pipe(int fd, uint32_t events)
+{
+ if (fd == thread_quit_pipe[0] && (events & LPOLLIN)) {
+ return 1;
+ }
+
+ return 0;
+}
+
+/*
+ * Remove modules in reverse load order.
+ */
+static int modprobe_remove_kernel_modules(void)
+{
+ int ret = 0, i;
+ char modprobe[256];
+
+ for (i = ARRAY_SIZE(kernel_modules_list) - 1; i >= 0; i--) {
+ ret = snprintf(modprobe, sizeof(modprobe),
+ "/sbin/modprobe --remove --quiet %s",
+ kernel_modules_list[i].name);
+ if (ret < 0) {
+ perror("snprintf modprobe --remove");
+ goto error;
+ }
+ modprobe[sizeof(modprobe) - 1] = '\0';
+ ret = system(modprobe);
+ if (ret == -1) {
+ ERR("Unable to launch modprobe --remove for module %s",
+ kernel_modules_list[i].name);
+ } else if (kernel_modules_list[i].required
+ && WEXITSTATUS(ret) != 0) {
+ ERR("Unable to remove module %s",
+ kernel_modules_list[i].name);
+ } else {
+ DBG("Modprobe removal successful %s",
+ kernel_modules_list[i].name);
+ }
+ }
+
+error:
+ return ret;
+}
+
+/*
+ * Return group ID of the tracing group or -1 if not found.
+ */
static gid_t allowed_group(void)
{
struct group *grp;
}
/*
- * Init quit pipe.
+ * Init thread quit pipe.
*
* Return -1 on error or 0 if all pipes are created.
*/
lttcomm_close_unix_sock(session->kernel_session->consumer_fd);
}
- trace_destroy_kernel_session(session->kernel_session);
+ trace_kernel_destroy_session(session->kernel_session);
/* Extra precaution */
session->kernel_session = NULL;
}
}
+/*
+ * Stop all threads by closing the thread quit pipe.
+ */
static void stop_threads(void)
{
+ int ret;
+
/* Stopping all threads */
DBG("Terminating all threads");
- close(thread_quit_pipe[0]);
- close(thread_quit_pipe[1]);
+ ret = write(thread_quit_pipe[1], "!", 1);
+ if (ret < 0) {
+ ERR("write error on thread quit pipe");
+ }
+
+ /* Dispatch thread */
+ dispatch_thread_exit = 1;
+ futex_nto1_wake(&ust_cmd_queue.futex);
}
/*
DBG("Cleaning up");
/* <fun> */
- MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm%c[%d;%dm"
+ MSG("%c[%d;%dm*** assert failed *** ==> %c[%dm%c[%d;%dm"
"Matthew, BEET driven development works!%c[%dm",
27, 1, 31, 27, 0, 27, 1, 33, 27, 0);
/* </fun> */
- DBG("Removing %s directory", LTTNG_RUNDIR);
- ret = asprintf(&cmd, "rm -rf " LTTNG_RUNDIR);
- if (ret < 0) {
- ERR("asprintf failed. Something is really wrong!");
- }
+ if (is_root) {
+ DBG("Removing %s directory", LTTNG_RUNDIR);
+ ret = asprintf(&cmd, "rm -rf " LTTNG_RUNDIR);
+ if (ret < 0) {
+ ERR("asprintf failed. Something is really wrong!");
+ }
- /* Remove lttng run directory */
- ret = system(cmd);
- if (ret < 0) {
- ERR("Unable to clean " LTTNG_RUNDIR);
+ /* Remove lttng run directory */
+ ret = system(cmd);
+ if (ret < 0) {
+ ERR("Unable to clean " LTTNG_RUNDIR);
+ }
}
DBG("Cleaning up all session");
}
}
+ DBG("Closing all UST sockets");
+ clean_traceable_apps_list();
+
pthread_mutex_destroy(&kconsumerd_pid_mutex);
DBG("Closing kernel fd");
close(kernel_tracer_fd);
- DBG("Unloading kernel modules");
- modprobe_remove_kernel_modules();
+ if (is_root) {
+ DBG("Unloading kernel modules");
+ modprobe_remove_kernel_modules();
+ }
+
+ close(thread_quit_pipe[0]);
+ close(thread_quit_pipe[1]);
}
/*
return ret;
}
-#ifdef DISABLED
/*
- * Return a socket connected to the libust communication socket of the
- * application identified by the pid.
- *
- * If the pid is not found in the traceable list, return -1 to indicate error.
+ * Notify UST applications using the shm mmap futex.
*/
-static int ust_connect_app(pid_t pid)
+static int notify_ust_apps(int active)
{
- int sock;
- struct ltt_traceable_app *lta;
+ char *wait_shm_mmap;
- DBG("Connect to application pid %d", pid);
+ DBG("Notifying applications of session daemon state: %d", active);
- lta = find_app_by_pid(pid);
- if (lta == NULL) {
- /* App not found */
- DBG("Application pid %d not found", pid);
- return -1;
- }
-
- sock = ustctl_connect_pid(lta->pid);
- if (sock < 0) {
- ERR("Fail connecting to the PID %d", pid);
- }
-
- return sock;
-}
-#endif /* DISABLED */
-
-/*
- * Notify apps by writing 42 to a named pipe using name. Every applications
- * waiting for a ltt-sessiond will be notified and re-register automatically to
- * the session daemon.
- *
- * Return open or write error value.
- */
-static int notify_apps(const char *name)
-{
- int fd;
- int ret = -1;
-
- DBG("Notify the global application pipe");
-
- /* Try opening the global pipe */
- fd = open(name, O_WRONLY);
- if (fd < 0) {
+ /* See shm.c for this call implying mmap, shm and futex calls */
+ wait_shm_mmap = shm_ust_get_mmap(wait_shm_path, is_root);
+ if (wait_shm_mmap == NULL) {
goto error;
}
- /* Notify by writing on the pipe */
- ret = write(fd, "42", 2);
- if (ret < 0) {
- perror("write");
- }
+ /* Wake waiting process */
+ futex_wait_update((int32_t *) wait_shm_mmap, active);
+
+ /* Apps notified successfully */
+ return 0;
error:
- return ret;
+ return -1;
}
/*
}
/*
- * Update the kernel pollfd set of all channel fd available over all tracing
+ * Update the kernel poll set of all channel fd available over all tracing
* session. Add the wakeup pipe at the end of the set.
*/
-static int update_kernel_pollfd(void)
+static int update_kernel_poll(struct lttng_poll_event *events)
{
- int i = 0;
- /*
- * The wakup pipe and the quit pipe are needed so the number of fds starts
- * at 2 for those pipes.
- */
- unsigned int nb_fd = 2;
+ int ret;
struct ltt_session *session;
struct ltt_kernel_channel *channel;
- DBG("Updating kernel_pollfd");
+ DBG("Updating kernel poll set");
- /* Get the number of channel of all kernel session */
lock_session_list();
cds_list_for_each_entry(session, &session_list_ptr->head, list) {
lock_session(session);
unlock_session(session);
continue;
}
- nb_fd += session->kernel_session->channel_count;
- unlock_session(session);
- }
-
- DBG("Resizing kernel_pollfd to size %d", nb_fd);
- kernel_pollfd = realloc(kernel_pollfd, nb_fd * sizeof(struct pollfd));
- if (kernel_pollfd == NULL) {
- perror("malloc kernel_pollfd");
- goto error;
- }
-
- cds_list_for_each_entry(session, &session_list_ptr->head, list) {
- lock_session(session);
- if (session->kernel_session == NULL) {
- unlock_session(session);
- continue;
- }
- if (i >= nb_fd) {
- ERR("To much channel for kernel_pollfd size");
- unlock_session(session);
- break;
- }
cds_list_for_each_entry(channel, &session->kernel_session->channel_list.head, list) {
- kernel_pollfd[i].fd = channel->fd;
- kernel_pollfd[i].events = POLLIN | POLLRDNORM;
- i++;
+ /* Add channel fd to the kernel poll set */
+ ret = lttng_poll_add(events, channel->fd, LPOLLIN | LPOLLRDNORM);
+ if (ret < 0) {
+ unlock_session(session);
+ goto error;
+ }
+ DBG("Channel fd %d added to kernel set", channel->fd);
}
unlock_session(session);
}
unlock_session_list();
- /* Adding wake up pipe */
- kernel_pollfd[nb_fd - 2].fd = kernel_poll_pipe[0];
- kernel_pollfd[nb_fd - 2].events = POLLIN;
-
- /* Adding the quit pipe */
- kernel_pollfd[nb_fd - 1].fd = thread_quit_pipe[0];
-
- return nb_fd;
+ return 0;
error:
unlock_session_list();
session->kernel_session->consumer_fd = kconsumerd_cmd_sock;
}
- cds_list_for_each_entry(channel, &session->kernel_session->channel_list.head, list) {
+ cds_list_for_each_entry(channel,
+ &session->kernel_session->channel_list.head, list) {
if (channel->fd == fd) {
DBG("Channel found, updating kernel streams");
ret = kernel_open_channel_stream(channel);
if (ret < 0) {
- goto end;
+ goto error;
}
/*
- * Have we already sent fds to the consumer? If yes, it means that
- * tracing is started so it is safe to send our updated stream fds.
+ * Have we already sent fds to the consumer? If yes, it means
+ * that tracing is started so it is safe to send our updated
+ * stream fds.
*/
if (session->kernel_session->kconsumer_fds_sent == 1) {
- ret = send_kconsumerd_channel_fds(session->kernel_session->consumer_fd,
- channel);
+ ret = send_kconsumerd_channel_fds(
+ session->kernel_session->consumer_fd, channel);
if (ret < 0) {
- goto end;
+ goto error;
}
}
- goto end;
+ goto error;
}
}
unlock_session(session);
}
+ unlock_session_list();
+ return ret;
-end:
+error:
+ unlock_session(session);
unlock_session_list();
- if (session) {
- unlock_session(session);
- }
return ret;
}
*/
static void *thread_manage_kernel(void *data)
{
- int ret, i, nb_fd = 0;
+ int ret, i, pollfd, update_poll_flag = 1;
+ uint32_t revents, nb_fd;
char tmp;
- int update_poll_flag = 1;
+ struct lttng_poll_event events;
DBG("Thread manage kernel started");
+ ret = create_thread_poll_set(&events, 2);
+ if (ret < 0) {
+ goto error;
+ }
+
+ ret = lttng_poll_add(&events, kernel_poll_pipe[0], LPOLLIN);
+ if (ret < 0) {
+ goto error;
+ }
+
while (1) {
if (update_poll_flag == 1) {
- nb_fd = update_kernel_pollfd();
- if (nb_fd < 0) {
+ ret = update_kernel_poll(&events);
+ if (ret < 0) {
goto error;
}
update_poll_flag = 0;
}
- DBG("Polling on %d fds", nb_fd);
+ nb_fd = LTTNG_POLL_GETNB(&events);
+
+ DBG("Thread kernel polling on %d fds", nb_fd);
+
+ /* Zeroed the poll events */
+ lttng_poll_reset(&events);
/* Poll infinite value of time */
- ret = poll(kernel_pollfd, nb_fd, -1);
+ ret = lttng_poll_wait(&events, -1);
if (ret < 0) {
- perror("poll kernel thread");
goto error;
} else if (ret == 0) {
/* Should not happen since timeout is infinite */
+ ERR("Return value of poll is 0 with an infinite timeout.\n"
+ "This should not have happened! Continuing...");
continue;
}
- /* Thread quit pipe has been closed. Killing thread. */
- if (kernel_pollfd[nb_fd - 1].revents == POLLNVAL) {
- goto error;
- }
-
- DBG("Kernel poll event triggered");
+ for (i = 0; i < nb_fd; i++) {
+ /* Fetch once the poll data */
+ revents = LTTNG_POLL_GETEV(&events, i);
+ pollfd = LTTNG_POLL_GETFD(&events, i);
- /*
- * Check if the wake up pipe was triggered. If so, the kernel_pollfd
- * must be updated.
- */
- switch (kernel_pollfd[nb_fd - 2].revents) {
- case POLLIN:
- ret = read(kernel_poll_pipe[0], &tmp, 1);
- update_poll_flag = 1;
- continue;
- case POLLERR:
- goto error;
- default:
- break;
- }
+ /* Thread quit pipe has been closed. Killing thread. */
+ ret = check_thread_quit_pipe(pollfd, revents);
+ if (ret) {
+ goto error;
+ }
- for (i = 0; i < nb_fd; i++) {
- switch (kernel_pollfd[i].revents) {
- /*
- * New CPU detected by the kernel. Adding kernel stream to kernel
- * session and updating the kernel consumer
- */
- case POLLIN | POLLRDNORM:
- ret = update_kernel_stream(kernel_pollfd[i].fd);
- if (ret < 0) {
- continue;
+ /* Check for data on kernel pipe */
+ if (pollfd == kernel_poll_pipe[0] && (revents & LPOLLIN)) {
+ ret = read(kernel_poll_pipe[0], &tmp, 1);
+ update_poll_flag = 1;
+ continue;
+ } else {
+ /*
+ * New CPU detected by the kernel. Adding kernel stream to
+ * kernel session and updating the kernel consumer
+ */
+ if (revents & LPOLLIN) {
+ ret = update_kernel_stream(pollfd);
+ if (ret < 0) {
+ continue;
+ }
+ break;
+ /*
+ * TODO: We might want to handle the LPOLLERR | LPOLLHUP
+ * and unregister kernel stream at this point.
+ */
}
- break;
}
}
}
error:
DBG("Kernel thread dying");
- if (kernel_pollfd) {
- free(kernel_pollfd);
- }
-
close(kernel_poll_pipe[0]);
close(kernel_poll_pipe[1]);
+
+ lttng_poll_clean(&events);
+
return NULL;
}
*/
static void *thread_manage_kconsumerd(void *data)
{
- int sock = 0, ret;
+ int sock = 0, i, ret, pollfd;
+ uint32_t revents, nb_fd;
enum lttcomm_return_code code;
- struct pollfd pollfd[2];
+ struct lttng_poll_event events;
DBG("[thread] Manage kconsumerd started");
goto error;
}
- /* First fd is always the quit pipe */
- pollfd[0].fd = thread_quit_pipe[0];
+ /*
+ * Pass 2 as size here for the thread quit pipe and kconsumerd_err_sock.
+ * Nothing more will be added to this poll set.
+ */
+ ret = create_thread_poll_set(&events, 2);
+ if (ret < 0) {
+ goto error;
+ }
- /* Apps socket */
- pollfd[1].fd = kconsumerd_err_sock;
- pollfd[1].events = POLLIN;
+ ret = lttng_poll_add(&events, kconsumerd_err_sock, LPOLLIN | LPOLLRDHUP);
+ if (ret < 0) {
+ goto error;
+ }
+
+ nb_fd = LTTNG_POLL_GETNB(&events);
/* Inifinite blocking call, waiting for transmission */
- ret = poll(pollfd, 2, -1);
+ ret = lttng_poll_wait(&events, -1);
if (ret < 0) {
- perror("poll kconsumerd thread");
goto error;
}
- /* Thread quit pipe has been closed. Killing thread. */
- if (pollfd[0].revents == POLLNVAL) {
- goto error;
- } else if (pollfd[1].revents == POLLERR) {
- ERR("Kconsumerd err socket poll error");
- goto error;
+ for (i = 0; i < nb_fd; i++) {
+ /* Fetch once the poll data */
+ revents = LTTNG_POLL_GETEV(&events, i);
+ pollfd = LTTNG_POLL_GETFD(&events, i);
+
+ /* Thread quit pipe has been closed. Killing thread. */
+ ret = check_thread_quit_pipe(pollfd, revents);
+ if (ret) {
+ goto error;
+ }
+
+ /* Event on the registration socket */
+ if (pollfd == kconsumerd_err_sock) {
+ if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+ ERR("Kconsumerd err socket poll error");
+ goto error;
+ }
+ }
}
sock = lttcomm_accept_unix_sock(kconsumerd_err_sock);
perror("kconsumerd connect");
goto error;
}
- /* Signal condition to tell that the kconsumerd is ready */
- sem_post(&kconsumerd_sem);
- DBG("Kconsumerd command socket ready");
- } else {
- DBG("Kconsumerd error when waiting for SOCK_READY : %s",
- lttcomm_get_readable_code(-code));
- goto error;
+ /* Signal condition to tell that the kconsumerd is ready */
+ sem_post(&kconsumerd_sem);
+ DBG("Kconsumerd command socket ready");
+ } else {
+ DBG("Kconsumerd error when waiting for SOCK_READY : %s",
+ lttcomm_get_readable_code(-code));
+ goto error;
+ }
+
+ /* Remove the kconsumerd error socket since we have established a connexion */
+ ret = lttng_poll_del(&events, kconsumerd_err_sock);
+ if (ret < 0) {
+ goto error;
+ }
+
+ ret = lttng_poll_add(&events, sock, LPOLLIN | LPOLLRDHUP);
+ if (ret < 0) {
+ goto error;
+ }
+
+ /* Update number of fd */
+ nb_fd = LTTNG_POLL_GETNB(&events);
+
+ /* Inifinite blocking call, waiting for transmission */
+ ret = lttng_poll_wait(&events, -1);
+ if (ret < 0) {
+ goto error;
+ }
+
+ for (i = 0; i < nb_fd; i++) {
+ /* Fetch once the poll data */
+ revents = LTTNG_POLL_GETEV(&events, i);
+ pollfd = LTTNG_POLL_GETFD(&events, i);
+
+ /* Thread quit pipe has been closed. Killing thread. */
+ ret = check_thread_quit_pipe(pollfd, revents);
+ if (ret) {
+ goto error;
+ }
+
+ /* Event on the kconsumerd socket */
+ if (pollfd == sock) {
+ if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+ ERR("Kconsumerd err socket second poll error");
+ goto error;
+ }
+ }
+ }
+
+ /* Wait for any kconsumerd error */
+ ret = lttcomm_recv_unix_sock(sock, &code, sizeof(enum lttcomm_return_code));
+ if (ret <= 0) {
+ ERR("Kconsumerd closed the command socket");
+ goto error;
+ }
+
+ ERR("Kconsumerd return code : %s", lttcomm_get_readable_code(-code));
+
+error:
+ DBG("Kconsumerd thread dying");
+ close(kconsumerd_err_sock);
+ close(kconsumerd_cmd_sock);
+ close(sock);
+
+ unlink(kconsumerd_err_unix_sock_path);
+ unlink(kconsumerd_cmd_unix_sock_path);
+ kconsumerd_pid = 0;
+
+ lttng_poll_clean(&events);
+
+ return NULL;
+}
+
+/*
+ * This thread manage application communication.
+ */
+static void *thread_manage_apps(void *data)
+{
+ int i, ret, pollfd;
+ uint32_t revents, nb_fd;
+ struct ust_command ust_cmd;
+ struct lttng_poll_event events;
+
+ DBG("[thread] Manage application started");
+
+ ret = create_thread_poll_set(&events, 2);
+ if (ret < 0) {
+ goto error;
+ }
+
+ ret = lttng_poll_add(&events, apps_cmd_pipe[0], LPOLLIN | LPOLLRDHUP);
+ if (ret < 0) {
+ goto error;
+ }
+
+ while (1) {
+ /* Zeroed the events structure */
+ lttng_poll_reset(&events);
+
+ nb_fd = LTTNG_POLL_GETNB(&events);
+
+ DBG("Apps thread polling on %d fds", nb_fd);
+
+ /* Inifinite blocking call, waiting for transmission */
+ ret = lttng_poll_wait(&events, -1);
+ if (ret < 0) {
+ goto error;
+ }
+
+ for (i = 0; i < nb_fd; i++) {
+ /* Fetch once the poll data */
+ revents = LTTNG_POLL_GETEV(&events, i);
+ pollfd = LTTNG_POLL_GETFD(&events, i);
+
+ /* Thread quit pipe has been closed. Killing thread. */
+ ret = check_thread_quit_pipe(pollfd, revents);
+ if (ret) {
+ goto error;
+ }
+
+ /* Inspect the apps cmd pipe */
+ if (pollfd == apps_cmd_pipe[0]) {
+ if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+ ERR("Apps command pipe error");
+ goto error;
+ } else if (revents & LPOLLIN) {
+ /* Empty pipe */
+ ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
+ if (ret < 0 || ret < sizeof(ust_cmd)) {
+ perror("read apps cmd pipe");
+ goto error;
+ }
+
+ /* Register applicaton to the session daemon */
+ ret = register_traceable_app(&ust_cmd.reg_msg, ust_cmd.sock);
+ if (ret < 0) {
+ /* Only critical ENOMEM error can be returned here */
+ goto error;
+ }
+
+ ret = ustctl_register_done(ust_cmd.sock);
+ if (ret < 0) {
+ /*
+ * If the registration is not possible, we simply
+ * unregister the apps and continue
+ */
+ unregister_traceable_app(ust_cmd.sock);
+ } else {
+ /*
+ * We just need here to monitor the close of the UST
+ * socket and poll set monitor those by default.
+ */
+ ret = lttng_poll_add(&events, ust_cmd.sock, 0);
+ if (ret < 0) {
+ goto error;
+ }
+
+ DBG("Apps with sock %d added to poll set", ust_cmd.sock);
+ }
+ break;
+ }
+ } else {
+ /*
+ * At this point, we know that a registered application made the
+ * event at poll_wait.
+ */
+ if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+ /* Removing from the poll set */
+ ret = lttng_poll_del(&events, pollfd);
+ if (ret < 0) {
+ goto error;
+ }
+
+ /* Socket closed */
+ unregister_traceable_app(pollfd);
+ break;
+ }
+ }
+ }
}
- /* Kconsumerd err socket */
- pollfd[1].fd = sock;
- pollfd[1].events = POLLIN;
+error:
+ DBG("Application communication apps dying");
+ close(apps_cmd_pipe[0]);
+ close(apps_cmd_pipe[1]);
- /* Inifinite blocking call, waiting for transmission */
- ret = poll(pollfd, 2, -1);
- if (ret < 0) {
- perror("poll kconsumerd thread");
- goto error;
- }
+ lttng_poll_clean(&events);
- /* Thread quit pipe has been closed. Killing thread. */
- if (pollfd[0].revents == POLLNVAL) {
- goto error;
- } else if (pollfd[1].revents == POLLERR) {
- ERR("Kconsumerd err socket second poll error");
- goto error;
- }
+ return NULL;
+}
- /* Wait for any kconsumerd error */
- ret = lttcomm_recv_unix_sock(sock, &code, sizeof(enum lttcomm_return_code));
- if (ret <= 0) {
- ERR("Kconsumerd closed the command socket");
- goto error;
- }
+/*
+ * Dispatch request from the registration threads to the application
+ * communication thread.
+ */
+static void *thread_dispatch_ust_registration(void *data)
+{
+ int ret;
+ struct cds_wfq_node *node;
+ struct ust_command *ust_cmd = NULL;
- ERR("Kconsumerd return code : %s", lttcomm_get_readable_code(-code));
+ DBG("[thread] Dispatch UST command started");
-error:
- DBG("Kconsumerd thread dying");
- if (kconsumerd_err_sock) {
- close(kconsumerd_err_sock);
- }
- if (kconsumerd_cmd_sock) {
- close(kconsumerd_cmd_sock);
- }
- if (sock) {
- close(sock);
- }
+ while (!dispatch_thread_exit) {
+ /* Atomically prepare the queue futex */
+ futex_nto1_prepare(&ust_cmd_queue.futex);
- unlink(kconsumerd_err_unix_sock_path);
- unlink(kconsumerd_cmd_unix_sock_path);
+ do {
+ /* Dequeue command for registration */
+ node = cds_wfq_dequeue_blocking(&ust_cmd_queue.queue);
+ if (node == NULL) {
+ DBG("Waked up but nothing in the UST command queue");
+ /* Continue thread execution */
+ break;
+ }
- kconsumerd_pid = 0;
+ ust_cmd = caa_container_of(node, struct ust_command, node);
+
+ DBG("Dispatching UST registration pid:%d ppid:%d uid:%d"
+ " gid:%d sock:%d name:%s (version %d.%d)",
+ ust_cmd->reg_msg.pid, ust_cmd->reg_msg.ppid,
+ ust_cmd->reg_msg.uid, ust_cmd->reg_msg.gid,
+ ust_cmd->sock, ust_cmd->reg_msg.name,
+ ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor);
+ /*
+ * Inform apps thread of the new application registration. This
+ * call is blocking so we can be assured that the data will be read
+ * at some point in time or wait to the end of the world :)
+ */
+ ret = write(apps_cmd_pipe[1], ust_cmd,
+ sizeof(struct ust_command));
+ if (ret < 0) {
+ perror("write apps cmd pipe");
+ if (errno == EBADF) {
+ /*
+ * We can't inform the application thread to process
+ * registration. We will exit or else application
+ * registration will not occur and tracing will never
+ * start.
+ */
+ goto error;
+ }
+ }
+ free(ust_cmd);
+ } while (node != NULL);
+
+ /* Futex wait on queue. Blocking call on futex() */
+ futex_nto1_wait(&ust_cmd_queue.futex);
+ }
+
+error:
+ DBG("Dispatch thread dying");
return NULL;
}
/*
- * This thread manage the application socket communication
+ * This thread manage application registration.
*/
-static void *thread_manage_apps(void *data)
+static void *thread_registration_apps(void *data)
{
- int sock = 0, ret;
- struct pollfd pollfd[2];
-
- /* TODO: Something more elegant is needed but fine for now */
- /* FIXME: change all types to either uint8_t, uint32_t, uint64_t
- * for 32-bit vs 64-bit compat processes. */
- /* replicate in ust with version number */
- struct {
- int reg; /* 1:register, 0:unregister */
- pid_t pid;
- uid_t uid;
- } reg_msg;
+ int sock = 0, i, ret, pollfd;
+ uint32_t revents, nb_fd;
+ struct lttng_poll_event events;
+ /*
+ * Get allocated in this thread, enqueued to a global queue, dequeued and
+ * freed in the manage apps thread.
+ */
+ struct ust_command *ust_cmd = NULL;
- DBG("[thread] Manage apps started");
+ DBG("[thread] Manage application registration started");
ret = lttcomm_listen_unix_sock(apps_sock);
if (ret < 0) {
goto error;
}
- /* First fd is always the quit pipe */
- pollfd[0].fd = thread_quit_pipe[0];
+ /*
+ * Pass 2 as size here for the thread quit pipe and apps socket. Nothing
+ * more will be added to this poll set.
+ */
+ ret = create_thread_poll_set(&events, 2);
+ if (ret < 0) {
+ goto error;
+ }
- /* Apps socket */
- pollfd[1].fd = apps_sock;
- pollfd[1].events = POLLIN;
+ /* Add the application registration socket */
+ ret = lttng_poll_add(&events, apps_sock, LPOLLIN | LPOLLRDHUP);
+ if (ret < 0) {
+ goto error;
+ }
/* Notify all applications to register */
- notify_apps(default_global_apps_pipe);
+ ret = notify_ust_apps(1);
+ if (ret < 0) {
+ ERR("Failed to notify applications or create the wait shared memory.\n"
+ "Execution continues but there might be problem for already running\n"
+ "applications that wishes to register.");
+ }
while (1) {
DBG("Accepting application registration");
+ nb_fd = LTTNG_POLL_GETNB(&events);
+
/* Inifinite blocking call, waiting for transmission */
- ret = poll(pollfd, 2, -1);
+ ret = lttng_poll_wait(&events, -1);
if (ret < 0) {
- perror("poll apps thread");
goto error;
}
- /* Thread quit pipe has been closed. Killing thread. */
- if (pollfd[0].revents == POLLNVAL) {
- goto error;
- } else if (pollfd[1].revents == POLLERR) {
- ERR("Apps socket poll error");
- goto error;
- }
+ for (i = 0; i < nb_fd; i++) {
+ /* Fetch once the poll data */
+ revents = LTTNG_POLL_GETEV(&events, i);
+ pollfd = LTTNG_POLL_GETFD(&events, i);
- sock = lttcomm_accept_unix_sock(apps_sock);
- if (sock < 0) {
- goto error;
- }
+ /* Thread quit pipe has been closed. Killing thread. */
+ ret = check_thread_quit_pipe(pollfd, revents);
+ if (ret) {
+ goto error;
+ }
- /*
- * Using message-based transmissions to ensure we don't
- * have to deal with partially received messages.
- */
- ret = lttcomm_recv_unix_sock(sock, ®_msg, sizeof(reg_msg));
- if (ret < 0) {
- perror("recv");
- continue;
- }
+ /* Event on the registration socket */
+ if (pollfd == apps_sock) {
+ if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+ ERR("Register apps socket poll error");
+ goto error;
+ } else if (revents & LPOLLIN) {
+ sock = lttcomm_accept_unix_sock(apps_sock);
+ if (sock < 0) {
+ goto error;
+ }
- /* Add application to the global traceable list */
- if (reg_msg.reg == 1) {
- /* Registering */
- /*
- * TODO: socket should be either passed to a
- * listener thread (for more messages) or
- * closed. It currently leaks.
- */
- ret = register_traceable_app(reg_msg.pid, reg_msg.uid);
- if (ret < 0) {
- /* register_traceable_app only return an error with
- * ENOMEM. At this point, we better stop everything.
- */
- goto error;
+ /* Create UST registration command for enqueuing */
+ ust_cmd = malloc(sizeof(struct ust_command));
+ if (ust_cmd == NULL) {
+ perror("ust command malloc");
+ goto error;
+ }
+
+ /*
+ * Using message-based transmissions to ensure we don't
+ * have to deal with partially received messages.
+ */
+ ret = lttcomm_recv_unix_sock(sock, &ust_cmd->reg_msg,
+ sizeof(struct ust_register_msg));
+ if (ret < 0 || ret < sizeof(struct ust_register_msg)) {
+ if (ret < 0) {
+ perror("lttcomm_recv_unix_sock register apps");
+ } else {
+ ERR("Wrong size received on apps register");
+ }
+ free(ust_cmd);
+ close(sock);
+ continue;
+ }
+
+ ust_cmd->sock = sock;
+
+ DBG("UST registration received with pid:%d ppid:%d uid:%d"
+ " gid:%d sock:%d name:%s (version %d.%d)",
+ ust_cmd->reg_msg.pid, ust_cmd->reg_msg.ppid,
+ ust_cmd->reg_msg.uid, ust_cmd->reg_msg.gid,
+ ust_cmd->sock, ust_cmd->reg_msg.name,
+ ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor);
+ /*
+ * Lock free enqueue the registration request. The red pill
+ * has been taken! This apps will be part of the *system* :)
+ */
+ cds_wfq_enqueue(&ust_cmd_queue.queue, &ust_cmd->node);
+
+ /*
+ * Wake the registration queue futex. Implicit memory
+ * barrier with the exchange in cds_wfq_enqueue.
+ */
+ futex_nto1_wake(&ust_cmd_queue.futex);
+ }
}
- } else {
- /* Unregistering */
- unregister_traceable_app(reg_msg.pid);
}
}
error:
- DBG("Apps thread dying");
- if (apps_sock) {
- close(apps_sock);
- }
- if (sock) {
- close(sock);
- }
+ DBG("UST Registration thread dying");
+ /* Notify that the registration thread is gone */
+ notify_ust_apps(0);
+
+ close(apps_sock);
+ close(sock);
unlink(apps_unix_sock_path);
+
+ lttng_poll_clean(&events);
+
return NULL;
}
return ret;
}
-/*
- * modprobe_remove_kernel_modules
- * Remove modules in reverse load order.
- */
-static int modprobe_remove_kernel_modules(void)
-{
- int ret = 0, i;
- char modprobe[256];
-
- for (i = ARRAY_SIZE(kernel_modules_list) - 1; i >= 0; i--) {
- ret = snprintf(modprobe, sizeof(modprobe),
- "/sbin/modprobe --remove --quiet %s",
- kernel_modules_list[i].name);
- if (ret < 0) {
- perror("snprintf modprobe --remove");
- goto error;
- }
- modprobe[sizeof(modprobe) - 1] = '\0';
- ret = system(modprobe);
- if (ret == -1) {
- ERR("Unable to launch modprobe --remove for module %s",
- kernel_modules_list[i].name);
- } else if (kernel_modules_list[i].required
- && WEXITSTATUS(ret) != 0) {
- ERR("Unable to remove module %s",
- kernel_modules_list[i].name);
- } else {
- DBG("Modprobe removal successful %s",
- kernel_modules_list[i].name);
- }
- }
-
-error:
- return ret;
-}
-
/*
* mount_debugfs
*/
}
/*
- * Notify kernel thread to update it's pollfd.
+ * Notify kernel thread to update it's poll set.
*/
-static int notify_kernel_pollfd(void)
+static int notify_kernel_channels_update(void)
{
int ret;
return NULL;
}
+/*
+ * Create an UST session and add it to the session ust list.
+ */
+static int create_ust_session(pid_t pid, struct ltt_session *session)
+{
+ int ret = -1;
+ struct ltt_ust_session *lus;
+
+ DBG("Creating UST session");
+
+ lus = trace_ust_create_session(session->path, pid);
+ if (lus == NULL) {
+ goto error;
+ }
+
+ ret = mkdir_recursive(lus->path, S_IRWXU | S_IRWXG,
+ geteuid(), allowed_group());
+ if (ret < 0) {
+ if (ret != -EEXIST) {
+ ERR("Trace directory creation error");
+ goto error;
+ }
+ }
+
+ /* Create session on the UST tracer */
+ ret = ustctl_create_session(lus);
+ if (ret < 0) {
+ goto error;
+ }
+
+ return 0;
+
+error:
+ free(lus);
+ return ret;
+}
+
/*
* Create a kernel tracer session then create the default channel.
*/
session->kernel_session->consumer_fd = kconsumerd_cmd_sock;
}
- ret = asprintf(&session->kernel_session->trace_path, "%s/kernel",
- session->path);
- if (ret < 0) {
- perror("asprintf kernel traces path");
- goto error;
- }
-
ret = mkdir_recursive(session->kernel_session->trace_path,
S_IRWXU | S_IRWXG, geteuid(), allowed_group());
if (ret < 0) {
goto error;
}
}
-
/* Need a session for kernel command */
switch (cmd_ctx->lsm->cmd_type) {
case LTTNG_CALIBRATE:
ret = LTTCOMM_KERN_SESS_FAIL;
goto error;
}
-
/* Start the kernel consumer daemon */
-
if (kconsumerd_pid == 0 &&
cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
ret = start_kconsumerd();
}
}
break;
+ case LTTNG_DOMAIN_UST_PID:
+ break;
default:
break;
}
switch (cmd_ctx->lsm->domain.type) {
case LTTNG_DOMAIN_KERNEL:
- kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
+ kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
cmd_ctx->session->kernel_session);
if (kchan == NULL) {
ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
switch (cmd_ctx->lsm->domain.type) {
case LTTNG_DOMAIN_KERNEL:
- kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
+ kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
cmd_ctx->session->kernel_session);
if (kchan == NULL) {
ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
goto error;
}
- kevent = get_kernel_event_by_name(cmd_ctx->lsm->u.disable.name, kchan);
+ kevent = trace_kernel_get_event_by_name(cmd_ctx->lsm->u.disable.name, kchan);
if (kevent != NULL) {
DBG("Disabling kernel event %s for channel %s.", kevent->event->name,
kchan->channel->name);
switch (cmd_ctx->lsm->domain.type) {
case LTTNG_DOMAIN_KERNEL:
DBG("Disabling all enabled kernel events");
- kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
+ kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
cmd_ctx->session->kernel_session);
if (kchan == NULL) {
ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
switch (cmd_ctx->lsm->domain.type) {
case LTTNG_DOMAIN_KERNEL:
- kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name,
+ kchan = trace_kernel_get_channel_by_name(
+ cmd_ctx->lsm->u.enable.channel_name,
cmd_ctx->session->kernel_session);
if (kchan == NULL) {
/* Channel not found, creating it */
- DBG("Creating kernel channel");
+ DBG("Creating kernel channel %s",
+ cmd_ctx->lsm->u.enable.channel_name);
ret = kernel_create_channel(cmd_ctx->session->kernel_session,
&cmd_ctx->lsm->u.channel.chan,
}
/* Notify kernel thread that there is a new channel */
- ret = notify_kernel_pollfd();
+ ret = notify_kernel_channels_update();
if (ret < 0) {
ret = LTTCOMM_FATAL;
goto error;
}
kernel_wait_quiescent(kernel_tracer_fd);
+ break;
+ case LTTNG_DOMAIN_UST_PID:
+
break;
default:
- /* TODO: Userspace tracing */
ret = LTTCOMM_NOT_IMPLEMENTED;
goto error;
}
switch (cmd_ctx->lsm->domain.type) {
case LTTNG_DOMAIN_KERNEL:
- kchan = get_kernel_channel_by_name(channel_name,
+ kchan = trace_kernel_get_channel_by_name(channel_name,
cmd_ctx->session->kernel_session);
if (kchan == NULL) {
DBG("Channel not found. Creating channel %s", channel_name);
ret = LTTCOMM_KERN_CHAN_FAIL;
goto error;
}
- kchan = get_kernel_channel_by_name(channel_name,
+ kchan = trace_kernel_get_channel_by_name(channel_name,
cmd_ctx->session->kernel_session);
if (kchan == NULL) {
ERR("Channel %s not found after creation. Internal error, giving up.",
ret = LTTCOMM_FATAL;
goto error;
}
+
+ ret = notify_kernel_channels_update();
+ if (ret < 0) {
+ ret = LTTCOMM_FATAL;
+ goto error;
+ }
}
- kevent = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan);
+ kevent = trace_kernel_get_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan);
if (kevent == NULL) {
DBG("Creating kernel event %s for channel %s.",
cmd_ctx->lsm->u.enable.event.name, channel_name);
switch (cmd_ctx->lsm->domain.type) {
case LTTNG_DOMAIN_KERNEL:
- kchan = get_kernel_channel_by_name(channel_name,
+ kchan = trace_kernel_get_channel_by_name(channel_name,
cmd_ctx->session->kernel_session);
if (kchan == NULL) {
DBG("Channel not found. Creating channel %s", channel_name);
ret = LTTCOMM_KERN_CHAN_FAIL;
goto error;
}
- kchan = get_kernel_channel_by_name(channel_name,
+ kchan = trace_kernel_get_channel_by_name(channel_name,
cmd_ctx->session->kernel_session);
if (kchan == NULL) {
ERR("Channel %s not found after creation. Internal error, giving up.",
ret = LTTCOMM_FATAL;
goto error;
}
+
+ ret = notify_kernel_channels_update();
+ if (ret < 0) {
+ ret = LTTCOMM_FATAL;
+ goto error;
+ }
}
/* For each event in the kernel session */
}
for (i = 0; i < size; i++) {
- kevent = get_kernel_event_by_name(event_list[i].name, kchan);
+ kevent = trace_kernel_get_event_by_name(event_list[i].name, kchan);
if (kevent == NULL) {
/* Default event type for enable all */
event_list[i].type = LTTNG_EVENT_TRACEPOINT;
}
/*
- * Must notify the kernel thread here to update it's pollfd in order to
- * remove the channel(s)' fd just destroyed.
+ * Must notify the kernel thread here to update it's poll setin order
+ * to remove the channel(s)' fd just destroyed.
*/
- ret = notify_kernel_pollfd();
+ ret = notify_kernel_channels_update();
if (ret < 0) {
ret = LTTCOMM_FATAL;
goto error;
nb_dom++;
}
- nb_dom += cmd_ctx->session->ust_trace_count;
+ nb_dom += cmd_ctx->session->ust_session_list.count;
ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_domain) * nb_dom);
if (ret < 0) {
struct ltt_kernel_channel *kchan = NULL;
if (cmd_ctx->session->kernel_session != NULL) {
- kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.list.channel_name,
+ kchan = trace_kernel_get_channel_by_name(cmd_ctx->lsm->u.list.channel_name,
cmd_ctx->session->kernel_session);
if (kchan == NULL) {
ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
*/
static void *thread_manage_clients(void *data)
{
- int sock = 0, ret;
+ int sock = 0, ret, i, pollfd;
+ uint32_t revents, nb_fd;
struct command_ctx *cmd_ctx = NULL;
- struct pollfd pollfd[2];
+ struct lttng_poll_event events;
DBG("[thread] Manage client started");
goto error;
}
- /* First fd is always the quit pipe */
- pollfd[0].fd = thread_quit_pipe[0];
+ /*
+ * Pass 2 as size here for the thread quit pipe and client_sock. Nothing
+ * more will be added to this poll set.
+ */
+ ret = create_thread_poll_set(&events, 2);
+ if (ret < 0) {
+ goto error;
+ }
- /* Apps socket */
- pollfd[1].fd = client_sock;
- pollfd[1].events = POLLIN;
+ /* Add the application registration socket */
+ ret = lttng_poll_add(&events, client_sock, LPOLLIN | LPOLLPRI);
+ if (ret < 0) {
+ goto error;
+ }
- /* Notify parent pid that we are ready
- * to accept command for client side.
+ /*
+ * Notify parent pid that we are ready to accept command for client side.
*/
if (opt_sig_parent) {
kill(ppid, SIGCHLD);
while (1) {
DBG("Accepting client command ...");
+ nb_fd = LTTNG_POLL_GETNB(&events);
+
/* Inifinite blocking call, waiting for transmission */
- ret = poll(pollfd, 2, -1);
+ ret = lttng_poll_wait(&events, -1);
if (ret < 0) {
- perror("poll client thread");
goto error;
}
- /* Thread quit pipe has been closed. Killing thread. */
- if (pollfd[0].revents == POLLNVAL) {
- goto error;
- } else if (pollfd[1].revents == POLLERR) {
- ERR("Client socket poll error");
- goto error;
+ for (i = 0; i < nb_fd; i++) {
+ /* Fetch once the poll data */
+ revents = LTTNG_POLL_GETEV(&events, i);
+ pollfd = LTTNG_POLL_GETFD(&events, i);
+
+ /* Thread quit pipe has been closed. Killing thread. */
+ ret = check_thread_quit_pipe(pollfd, revents);
+ if (ret) {
+ goto error;
+ }
+
+ /* Event on the registration socket */
+ if (pollfd == client_sock) {
+ if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+ ERR("Client socket poll error");
+ goto error;
+ }
+ }
}
+ DBG("Wait for client response");
+
sock = lttcomm_accept_unix_sock(client_sock);
if (sock < 0) {
goto error;
/* Allocate context command to process the client request */
cmd_ctx = malloc(sizeof(struct command_ctx));
+ if (cmd_ctx == NULL) {
+ perror("malloc cmd_ctx");
+ goto error;
+ }
/* Allocate data buffer for reception */
cmd_ctx->lsm = malloc(sizeof(struct lttcomm_session_msg));
+ if (cmd_ctx->lsm == NULL) {
+ perror("malloc cmd_ctx->lsm");
+ goto error;
+ }
+
cmd_ctx->llm = NULL;
cmd_ctx->session = NULL;
* the client.
*/
DBG("Receiving data from client ...");
- ret = lttcomm_recv_unix_sock(sock, cmd_ctx->lsm, sizeof(struct lttcomm_session_msg));
+ ret = lttcomm_recv_unix_sock(sock, cmd_ctx->lsm,
+ sizeof(struct lttcomm_session_msg));
if (ret <= 0) {
+ DBG("Nothing recv() from client... continuing");
+ close(sock);
+ free(cmd_ctx);
continue;
}
- // TODO: Validate cmd_ctx including sanity check for security purpose.
+ // TODO: Validate cmd_ctx including sanity check for
+ // security purpose.
/*
* This function dispatch the work to the kernel or userspace tracer
*/
ret = process_client_msg(cmd_ctx);
if (ret < 0) {
- /* TODO: Inform client somehow of the fatal error. At this point,
- * ret < 0 means that a malloc failed (ENOMEM). */
- /* Error detected but still accept command */
+ /*
+ * TODO: Inform client somehow of the fatal error. At
+ * this point, ret < 0 means that a malloc failed
+ * (ENOMEM). Error detected but still accept command.
+ */
clean_command_ctx(&cmd_ctx);
continue;
}
DBG("Sending response (size: %d, retcode: %d)",
cmd_ctx->lttng_msg_size, cmd_ctx->llm->ret_code);
- ret = send_unix_sock(sock, cmd_ctx->llm, cmd_ctx->lttng_msg_size);
+ ret = send_unix_sock(sock, cmd_ctx->llm,
+ cmd_ctx->lttng_msg_size);
if (ret < 0) {
ERR("Failed to send data back to client");
}
error:
DBG("Client thread dying");
- if (client_sock) {
- close(client_sock);
- }
- if (sock) {
- close(sock);
- }
-
unlink(client_unix_sock_path);
+ close(client_sock);
+ close(sock);
+ lttng_poll_clean(&events);
clean_command_ctx(&cmd_ctx);
return NULL;
}
static int check_existing_daemon(void)
{
if (access(client_unix_sock_path, F_OK) < 0 &&
- access(apps_unix_sock_path, F_OK) < 0)
+ access(apps_unix_sock_path, F_OK) < 0) {
return 0;
+ }
/* Is there anybody out there ? */
- if (lttng_session_daemon_alive())
+ if (lttng_session_daemon_alive()) {
return -EEXIST;
- else
+ } else {
return 0;
+ }
}
/*
return pipe2(kernel_poll_pipe, O_CLOEXEC);
}
+/*
+ * Create the application command pipe to wake thread_manage_apps.
+ */
+static int create_apps_cmd_pipe(void)
+{
+ return pipe2(apps_cmd_pipe, O_CLOEXEC);
+}
+
/*
* Create the lttng run directory needed for all global sockets and pipe.
*/
snprintf(client_unix_sock_path, PATH_MAX,
DEFAULT_GLOBAL_CLIENT_UNIX_SOCK);
}
+
+ /* Set global SHM for ust */
+ if (strlen(wait_shm_path) == 0) {
+ snprintf(wait_shm_path, PATH_MAX,
+ DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH);
+ }
} else {
home_path = get_home_dir();
if (home_path == NULL) {
snprintf(client_unix_sock_path, PATH_MAX,
DEFAULT_HOME_CLIENT_UNIX_SOCK, home_path);
}
+
+ /* Set global SHM for ust */
+ if (strlen(wait_shm_path) == 0) {
+ snprintf(wait_shm_path, PATH_MAX,
+ DEFAULT_HOME_APPS_WAIT_SHM_PATH, geteuid());
+ }
}
DBG("Client socket path %s", client_unix_sock_path);
goto exit;
}
+ /* Setup the thread apps communication pipe. */
+ if ((ret = create_apps_cmd_pipe()) < 0) {
+ goto exit;
+ }
+
+ /* Init UST command queue. */
+ cds_wfq_init(&ust_cmd_queue.queue);
+
/*
* Get session list pointer. This pointer MUST NOT be free().
* This list is statically declared in session.c
*/
session_list_ptr = get_session_list();
+ /* Set up max poll set size */
+ lttng_poll_set_max_size();
+
/* Create thread to manage the client socket */
- ret = pthread_create(&client_thread, NULL, thread_manage_clients, (void *) NULL);
+ ret = pthread_create(&client_thread, NULL,
+ thread_manage_clients, (void *) NULL);
if (ret != 0) {
- perror("pthread_create");
+ perror("pthread_create clients");
goto exit_client;
}
+ /* Create thread to dispatch registration */
+ ret = pthread_create(&dispatch_thread, NULL,
+ thread_dispatch_ust_registration, (void *) NULL);
+ if (ret != 0) {
+ perror("pthread_create dispatch");
+ goto exit_dispatch;
+ }
+
+ /* Create thread to manage application registration. */
+ ret = pthread_create(®_apps_thread, NULL,
+ thread_registration_apps, (void *) NULL);
+ if (ret != 0) {
+ perror("pthread_create registration");
+ goto exit_reg_apps;
+ }
+
/* Create thread to manage application socket */
ret = pthread_create(&apps_thread, NULL, thread_manage_apps, (void *) NULL);
if (ret != 0) {
- perror("pthread_create");
+ perror("pthread_create apps");
goto exit_apps;
}
/* Create kernel thread to manage kernel event */
ret = pthread_create(&kernel_thread, NULL, thread_manage_kernel, (void *) NULL);
if (ret != 0) {
- perror("pthread_create");
+ perror("pthread_create kernel");
goto exit_kernel;
}
}
exit_apps:
+ ret = pthread_join(reg_apps_thread, &status);
+ if (ret != 0) {
+ perror("pthread_join");
+ goto error; /* join error, exit without cleanup */
+ }
+
+exit_reg_apps:
+ ret = pthread_join(dispatch_thread, &status);
+ if (ret != 0) {
+ perror("pthread_join");
+ goto error; /* join error, exit without cleanup */
+ }
+
+exit_dispatch:
ret = pthread_join(client_thread, &status);
if (ret != 0) {
perror("pthread_join");
projects / lttng-tools.git / blobdiff