*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <getopt.h>
#include <grp.h>
#include <limits.h>
#include <common/common.h>
#include <common/compat/socket.h>
+#include <common/compat/getenv.h>
#include <common/defaults.h>
#include <common/kernel-consumer/kernel-consumer.h>
#include <common/futex.h>
#include "agent-thread.h"
#include "save.h"
#include "load-session-thread.h"
+#include "syscall.h"
+#include "agent.h"
#define CONSUMERD_FILE "lttng-consumerd"
/* Command line options */
static const struct option long_options[] = {
- { "client-sock", 1, 0, 'c' },
- { "apps-sock", 1, 0, 'a' },
- { "kconsumerd-cmd-sock", 1, 0, 'C' },
- { "kconsumerd-err-sock", 1, 0, 'E' },
- { "ustconsumerd32-cmd-sock", 1, 0, 'G' },
- { "ustconsumerd32-err-sock", 1, 0, 'H' },
- { "ustconsumerd64-cmd-sock", 1, 0, 'D' },
- { "ustconsumerd64-err-sock", 1, 0, 'F' },
- { "consumerd32-path", 1, 0, 'u' },
- { "consumerd32-libdir", 1, 0, 'U' },
- { "consumerd64-path", 1, 0, 't' },
- { "consumerd64-libdir", 1, 0, 'T' },
- { "daemonize", 0, 0, 'd' },
- { "background", 0, 0, 'b' },
- { "sig-parent", 0, 0, 'S' },
- { "help", 0, 0, 'h' },
- { "group", 1, 0, 'g' },
- { "version", 0, 0, 'V' },
- { "quiet", 0, 0, 'q' },
- { "verbose", 0, 0, 'v' },
- { "verbose-consumer", 0, 0, 'Z' },
- { "no-kernel", 0, 0, 'N' },
- { "pidfile", 1, 0, 'p' },
- { "agent-tcp-port", 1, 0, 'J' },
- { "config", 1, 0, 'f' },
- { "load", 1, 0, 'l' },
- { "kmod-probes", 1, 0, 'P' },
+ { "client-sock", required_argument, 0, 'c' },
+ { "apps-sock", required_argument, 0, 'a' },
+ { "kconsumerd-cmd-sock", required_argument, 0, '\0' },
+ { "kconsumerd-err-sock", required_argument, 0, '\0' },
+ { "ustconsumerd32-cmd-sock", required_argument, 0, '\0' },
+ { "ustconsumerd32-err-sock", required_argument, 0, '\0' },
+ { "ustconsumerd64-cmd-sock", required_argument, 0, '\0' },
+ { "ustconsumerd64-err-sock", required_argument, 0, '\0' },
+ { "consumerd32-path", required_argument, 0, '\0' },
+ { "consumerd32-libdir", required_argument, 0, '\0' },
+ { "consumerd64-path", required_argument, 0, '\0' },
+ { "consumerd64-libdir", required_argument, 0, '\0' },
+ { "daemonize", no_argument, 0, 'd' },
+ { "background", no_argument, 0, 'b' },
+ { "sig-parent", no_argument, 0, 'S' },
+ { "help", no_argument, 0, 'h' },
+ { "group", required_argument, 0, 'g' },
+ { "version", no_argument, 0, 'V' },
+ { "quiet", no_argument, 0, 'q' },
+ { "verbose", no_argument, 0, 'v' },
+ { "verbose-consumer", no_argument, 0, '\0' },
+ { "no-kernel", no_argument, 0, '\0' },
+ { "pidfile", required_argument, 0, 'p' },
+ { "agent-tcp-port", required_argument, 0, '\0' },
+ { "config", required_argument, 0, 'f' },
+ { "load", required_argument, 0, 'l' },
+ { "kmod-probes", required_argument, 0, '\0' },
+ { "extra-kmod-probes", required_argument, 0, '\0' },
{ NULL, 0, 0, 0 }
};
* 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
/* 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
/*
* runtime env. var. overrides the build default.
*/
- bin = getenv("LTTNG_CONSUMERD32_BIN");
+ bin = lttng_secure_getenv("LTTNG_CONSUMERD32_BIN");
if (bin) {
consumerd32_bin = bin;
}
- bin = getenv("LTTNG_CONSUMERD64_BIN");
+ bin = lttng_secure_getenv("LTTNG_CONSUMERD64_BIN");
if (bin) {
consumerd64_bin = bin;
}
- libdir = getenv("LTTNG_CONSUMERD32_LIBDIR");
+ libdir = lttng_secure_getenv("LTTNG_CONSUMERD32_LIBDIR");
if (libdir) {
consumerd32_libdir = libdir;
}
- libdir = getenv("LTTNG_CONSUMERD64_LIBDIR");
+ libdir = lttng_secure_getenv("LTTNG_CONSUMERD64_LIBDIR");
if (libdir) {
consumerd64_libdir = libdir;
}
}
-/*
- * 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)
+static
+int __sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size,
+ int *a_pipe)
{
int ret;
}
/* Add quit pipe */
- ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR);
+ ret = lttng_poll_add(events, a_pipe[0], LPOLLIN | LPOLLERR);
if (ret < 0) {
goto 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.
*
*/
int sessiond_check_thread_quit_pipe(int fd, uint32_t events)
{
- if (fd == thread_quit_pipe[0] && (events & LPOLLIN)) {
- return 1;
- }
+ return __sessiond_check_thread_quit_pipe(fd, events,
+ thread_quit_pipe[0]);
+}
- return 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]);
}
/*
*
* Return -1 on error or 0 if all pipes are created.
*/
-static int init_thread_quit_pipe(void)
+static int __init_thread_quit_pipe(int *a_pipe)
{
int ret, i;
- ret = pipe(thread_quit_pipe);
+ ret = pipe(a_pipe);
if (ret < 0) {
PERROR("thread quit pipe");
goto error;
}
for (i = 0; i < 2; i++) {
- ret = fcntl(thread_quit_pipe[i], F_SETFD, FD_CLOEXEC);
+ ret = fcntl(a_pipe[i], F_SETFD, FD_CLOEXEC);
if (ret < 0) {
PERROR("fcntl");
goto 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);
+}
+
/*
* Stop all threads by closing the thread quit pipe.
*/
}
/*
- * Cleanup the daemon
+ * Cleanup the session daemon's data structures.
*/
-static void cleanup(void)
+static void sessiond_cleanup(void)
{
int ret;
struct ltt_session *sess, *stmp;
char path[PATH_MAX];
- DBG("Cleaning up");
+ DBG("Cleanup sessiond");
/*
* Close the thread quit pipe. It has already done its job,
}
}
+ DBG("Cleaning up all agent apps");
+ agent_app_ht_clean();
+
DBG("Closing all UST sockets");
ust_app_clean_list();
buffer_reg_destroy_registries();
}
DBG("Unloading kernel modules");
modprobe_remove_lttng_all();
+ free(syscall_table);
}
close_consumer_sockets();
- /*
- * 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);
- }
-
- if (opt_pidfile) {
- free(opt_pidfile);
- }
-
- if (opt_load_session_path) {
- free(opt_load_session_path);
- }
-
if (load_info) {
load_session_destroy_data(load_info);
free(load_info);
if (lockfile_fd >= 0) {
char lockfile_path[PATH_MAX];
- ret = generate_lock_file_path(lockfile_path, sizeof(lockfile_path));
+ ret = generate_lock_file_path(lockfile_path,
+ sizeof(lockfile_path));
if (ret > 0) {
ret = remove(lockfile_path);
if (ret < 0) {
*/
free(rundir);
+}
+
+/*
+ * Cleanup the daemon's option data structures.
+ */
+static void sessiond_cleanup_options(void)
+{
+ 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);
/* <fun> */
DBG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
}
ksess = session->kernel_session;
- cds_list_for_each_entry(channel, &ksess->channel_list.head, list) {
- if (channel->fd == fd) {
- DBG("Channel found, updating kernel streams");
- ret = kernel_open_channel_stream(channel);
- if (ret < 0) {
- goto error;
- }
- /* Update the stream global counter */
- ksess->stream_count_global += ret;
+ cds_list_for_each_entry(channel,
+ &ksess->channel_list.head, list) {
+ struct lttng_ht_iter iter;
+ struct consumer_socket *socket;
- /*
- * 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 (ksess->consumer_fds_sent == 1 && ksess->consumer != NULL) {
- struct lttng_ht_iter iter;
- struct consumer_socket *socket;
-
- rcu_read_lock();
- 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,
- channel, ksess,
- session->output_traces ? 1 : 0);
- pthread_mutex_unlock(socket->lock);
- if (ret < 0) {
- rcu_read_unlock();
- goto error;
- }
- }
+ if (channel->fd != fd) {
+ continue;
+ }
+ DBG("Channel found, updating kernel streams");
+ ret = kernel_open_channel_stream(channel);
+ if (ret < 0) {
+ goto error;
+ }
+ /* Update the stream global counter */
+ ksess->stream_count_global += ret;
+
+ /*
+ * 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 (ksess->consumer_fds_sent != 1
+ || ksess->consumer == NULL) {
+ ret = -1;
+ goto error;
+ }
+
+ rcu_read_lock();
+ 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,
+ channel, ksess,
+ session->output_traces ? 1 : 0);
+ pthread_mutex_unlock(socket->lock);
+ if (ret < 0) {
rcu_read_unlock();
+ goto error;
}
- goto error;
}
+ rcu_read_unlock();
}
session_unlock(session);
}
/* For all tracing session(s) */
cds_list_for_each_entry_safe(sess, stmp, &session_list_ptr->head, list) {
+ struct ust_app *app;
+
session_lock(sess);
- if (sess->ust_session) {
- ust_app_global_update(sess->ust_session, app_sock);
+ if (!sess->ust_session) {
+ goto unlock_session;
}
+
+ rcu_read_lock();
+ assert(app_sock >= 0);
+ app = ust_app_find_by_sock(app_sock);
+ if (app == NULL) {
+ /*
+ * Application can be unregistered before so
+ * this is possible hence simply stopping the
+ * update.
+ */
+ DBG3("UST app update failed to find app sock %d",
+ app_sock);
+ goto unlock_rcu;
+ }
+ ust_app_global_update(sess->ust_session, app);
+ unlock_rcu:
+ rcu_read_unlock();
+ unlock_session:
session_unlock(sess);
}
}
update_poll_flag = 0;
}
- DBG("Thread kernel polling on %d fds", LTTNG_POLL_GETNB(&events));
+ DBG("Thread kernel polling");
/* Poll infinite value of time */
restart:
health_poll_entry();
ret = lttng_poll_wait(&events, -1);
+ DBG("Thread kernel return from poll on %d fds",
+ LTTNG_POLL_GETNB(&events));
health_poll_exit();
if (ret < 0) {
/*
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) {
*/
static void *thread_manage_consumer(void *data)
{
- int sock = -1, i, ret, pollfd, err = -1;
+ 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;
DBG("[thread] Manage consumer started");
+ rcu_register_thread();
+ rcu_thread_online();
+
health_register(health_sessiond, HEALTH_SESSIOND_TYPE_CONSUMER);
health_code_update();
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) {
/* Infinite blocking call, waiting for transmission */
restart_poll:
while (1) {
+ health_code_update();
+
+ /* Exit the thread because the thread quit pipe has been triggered. */
+ if (should_quit) {
+ /* Not a health error. */
+ err = 0;
+ goto exit;
+ }
+
health_poll_entry();
ret = lttng_poll_wait(&events, -1);
health_poll_exit();
health_code_update();
- /* Thread quit pipe has been closed. Killing thread. */
- ret = sessiond_check_thread_quit_pipe(pollfd, revents);
- if (ret) {
- err = 0;
- goto exit;
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
}
+ /*
+ * Thread quit pipe has been triggered, flag that we should stop
+ * but continue the current loop to handle potential data from
+ * consumer.
+ */
+ should_quit = sessiond_check_thread_quit_pipe(pollfd, revents);
+
if (pollfd == sock) {
/* Event on the consumerd socket */
if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
ERR("Handling metadata request");
goto error;
}
- break;
- } else {
- ERR("Unknown pollfd");
- goto error;
}
+ /* No need for an else branch all FDs are tested prior. */
}
health_code_update();
}
health_unregister(health_sessiond);
DBG("consumer thread cleanup completed");
+ rcu_thread_offline();
+ rcu_unregister_thread();
+
return NULL;
}
health_code_update();
while (1) {
- DBG("Apps thread polling on %d fds", LTTNG_POLL_GETNB(&events));
+ DBG("Apps thread polling");
/* Inifinite blocking call, waiting for transmission */
restart:
health_poll_entry();
ret = lttng_poll_wait(&events, -1);
+ DBG("Apps thread return from poll on %d fds",
+ LTTNG_POLL_GETNB(&events));
health_poll_exit();
if (ret < 0) {
/*
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) {
uint32_t revents = LTTNG_POLL_GETEV(&events, i);
int pollfd = LTTNG_POLL_GETFD(&events, i);
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
+ }
+
cds_list_for_each_entry_safe(wait_node, tmp_wait_node,
&wait_queue->head, head) {
if (pollfd == wait_node->app->sock &&
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) {
ust_cmd = zmalloc(sizeof(struct ust_command));
if (ust_cmd == NULL) {
PERROR("ust command zmalloc");
+ ret = close(sock);
+ if (ret) {
+ PERROR("close");
+ }
goto error;
}
/* Setup pthread condition */
ret = pthread_condattr_init(&consumer_data->condattr);
- if (ret != 0) {
+ if (ret) {
errno = ret;
PERROR("pthread_condattr_init consumer data");
goto error;
* for a more details and how we noticed it.
*/
ret = pthread_condattr_setclock(&consumer_data->condattr, CLOCK_MONOTONIC);
- if (ret != 0) {
+ if (ret) {
errno = ret;
PERROR("pthread_condattr_setclock consumer data");
goto error;
}
ret = pthread_cond_init(&consumer_data->cond, &consumer_data->condattr);
- if (ret != 0) {
+ 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 != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_create consumer");
ret = -1;
goto error;
int ret;
ret = kill(consumer_data->pid, SIGTERM);
if (ret) {
- ERR("Error killing consumer daemon");
+ PERROR("Error killing consumer daemon");
return ret;
}
return pthread_join(consumer_data->thread, &status);
char *tmp;
size_t tmplen;
- tmp = getenv("LD_LIBRARY_PATH");
+ tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
if (!tmp) {
tmp = "";
}
char *tmp;
size_t tmplen;
- tmp = getenv("LD_LIBRARY_PATH");
+ tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
if (!tmp) {
tmp = "";
}
* domain.
*/
if (session->kernel_session->consumer) {
- consumer_destroy_output(session->kernel_session->consumer);
+ consumer_output_put(session->kernel_session->consumer);
}
session->kernel_session->consumer =
consumer_copy_output(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_destroy_output(session->ust_session->consumer);
+ consumer_output_put(session->ust_session->consumer);
}
session->ust_session->consumer =
consumer_copy_output(session->consumer);
switch (domain->type) {
case LTTNG_DOMAIN_JUL:
+ case LTTNG_DOMAIN_LOG4J:
+ case LTTNG_DOMAIN_PYTHON:
case LTTNG_DOMAIN_UST:
break;
default:
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) {
session->kernel_session->consumer->dst.trace_path,
S_IRWXU | S_IRWXG, session->uid, session->gid);
if (ret < 0) {
- if (ret != -EEXIST) {
+ if (errno != EEXIST) {
ERR("Trace directory creation error");
goto error;
}
case LTTNG_SNAPSHOT_LIST_OUTPUT:
case LTTNG_SNAPSHOT_RECORD:
case LTTNG_SAVE_SESSION:
+ case LTTNG_SET_SESSION_SHM_PATH:
need_domain = 0;
break;
default:
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 */
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;
switch (cmd_ctx->lsm->cmd_type) {
case LTTNG_DISABLE_CHANNEL:
case LTTNG_DISABLE_EVENT:
- case LTTNG_DISABLE_ALL_EVENT:
switch (cmd_ctx->lsm->domain.type) {
case LTTNG_DOMAIN_KERNEL:
if (!cmd_ctx->session->kernel_session) {
}
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;
break;
case LTTNG_DOMAIN_JUL:
+ case LTTNG_DOMAIN_LOG4J:
+ case LTTNG_DOMAIN_PYTHON:
case LTTNG_DOMAIN_UST:
{
if (!ust_app_supported()) {
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;
}
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.name);
- break;
- }
- case LTTNG_DISABLE_ALL_EVENT:
- {
- DBG("Disabling all events");
-
- ret = cmd_disable_event_all(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:
&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;
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;
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;
}
if ((bytecode->len + sizeof(*bytecode)) != bytecode_len) {
+ free(filter_expression);
free(bytecode);
free(exclusion);
ret = LTTNG_ERR_FILTER_INVAL;
kernel_poll_pipe[1]);
break;
}
- case LTTNG_ENABLE_ALL_EVENT:
- {
- DBG("Enabling all events");
-
- ret = cmd_enable_event_all(cmd_ctx->session, &cmd_ctx->lsm->domain,
- cmd_ctx->lsm->u.enable.channel_name,
- cmd_ctx->lsm->u.enable.event.type, NULL, NULL,
- kernel_poll_pipe[1]);
- break;
- }
case LTTNG_LIST_TRACEPOINTS:
{
struct lttng_event *events;
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(cmd_ctx, sizeof(struct lttng_event) * nb_events);
+ if (ret < 0) {
+ free(events);
+ goto setup_error;
+ }
+
+ /* Copy event list into message payload */
+ memcpy(cmd_ctx->llm->payload, events,
+ sizeof(struct lttng_event) * nb_events);
+
+ free(events);
+
+ 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(cmd_ctx, sizeof(int32_t) * nr_pids);
+ if (ret < 0) {
+ free(pids);
+ goto setup_error;
+ }
+
+ /* Copy event list into message payload */
+ memcpy(cmd_ctx->llm->payload, pids,
+ sizeof(int) * nr_pids);
+
+ free(pids);
+
+ ret = LTTNG_OK;
+ break;
+ }
case LTTNG_SET_CONSUMER_URI:
{
size_t nb_uri, len;
goto error;
}
- ret = cmd_set_consumer_uri(cmd_ctx->lsm->domain.type, cmd_ctx->session,
- nb_uri, uris);
+ ret = cmd_set_consumer_uri(cmd_ctx->session, nb_uri, uris);
+ free(uris);
if (ret != LTTNG_OK) {
- free(uris);
goto error;
}
- /*
- * XXX: 0 means that this URI should be applied on the session. Should
- * be a DOMAIN enuam.
- */
- if (cmd_ctx->lsm->domain.type == 0) {
- /* Add the URI for the UST session if a consumer is present. */
- if (cmd_ctx->session->ust_session &&
- cmd_ctx->session->ust_session->consumer) {
- ret = cmd_set_consumer_uri(LTTNG_DOMAIN_UST, cmd_ctx->session,
- nb_uri, uris);
- } else if (cmd_ctx->session->kernel_session &&
- cmd_ctx->session->kernel_session->consumer) {
- ret = cmd_set_consumer_uri(LTTNG_DOMAIN_KERNEL,
- cmd_ctx->session, nb_uri, uris);
- }
- }
-
- free(uris);
break;
}
case LTTNG_LIST_DOMAINS:
{
ssize_t nb_dom;
- struct lttng_domain *domains;
+ struct lttng_domain *domains = NULL;
nb_dom = cmd_list_domains(cmd_ctx->session, &domains);
if (nb_dom < 0) {
case LTTNG_LIST_CHANNELS:
{
int nb_chan;
- struct lttng_channel *channels;
+ struct lttng_channel *channels = NULL;
nb_chan = cmd_list_channels(cmd_ctx->lsm->domain.type,
cmd_ctx->session, &channels);
}
case LTTNG_DATA_PENDING:
{
- ret = cmd_data_pending(cmd_ctx->session);
+ int pending_ret;
+
+ /* 1 byte to return whether or not data is pending */
+ ret = setup_lttng_msg(cmd_ctx, 1);
+ if (ret < 0) {
+ goto setup_error;
+ }
+
+ 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 = LTTNG_OK;
+ } else if (pending_ret < 0) {
+ ret = LTTNG_ERR_UNK;
+ goto setup_error;
+ } else {
+ ret = pending_ret;
+ goto setup_error;
+ }
+
+ *cmd_ctx->llm->payload = (uint8_t) pending_ret;
break;
}
case LTTNG_SNAPSHOT_ADD_OUTPUT:
&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;
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) {
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) {
health_code_update();
- DBG("Sending response (size: %d, retcode: %s)",
+ DBG("Sending response (size: %d, retcode: %s (%d))",
cmd_ctx->lttng_msg_size,
- lttng_strerror(-cmd_ctx->llm->ret_code));
+ 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");
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;
}
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 Load daemon configuration file\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);
}
/*
{
int ret = 0;
- switch (opt) {
- case 0:
- fprintf(stderr, "option %s", optname);
- if (arg) {
- fprintf(stderr, " with arg %s\n", arg);
- }
- break;
- case 'c':
- snprintf(client_unix_sock_path, PATH_MAX, "%s", arg);
- break;
- case 'a':
- snprintf(apps_unix_sock_path, PATH_MAX, "%s", arg);
- break;
- case 'd':
- opt_daemon = 1;
- break;
- case 'b':
- opt_background = 1;
- break;
- case 'g':
+ if (arg && arg[0] == '\0') {
/*
- * 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.
+ * 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 =
*/
- if (tracing_group_name_override) {
- free((void *) tracing_group_name);
+ ret = -EINVAL;
+ goto end;
+ }
+
+ if (string_match(optname, "client-sock") || opt == 'c') {
+ 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);
}
- tracing_group_name = strdup(arg);
- if (!tracing_group_name) {
- perror("strdup");
- ret = -ENOMEM;
+ } else if (string_match(optname, "apps-sock") || opt == 'a') {
+ 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);
}
- tracing_group_name_override = 1;
- break;
- case 'h':
+ } else if (string_match(optname, "daemonize") || opt == 'd') {
+ opt_daemon = 1;
+ } else if (string_match(optname, "background") || opt == 'b') {
+ opt_background = 1;
+ } else if (string_match(optname, "group") || opt == 'g') {
+ 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");
+ ret = -ENOMEM;
+ }
+ tracing_group_name_override = 1;
+ }
+ } else if (string_match(optname, "help") || opt == 'h') {
usage();
- exit(EXIT_FAILURE);
- case 'V':
+ exit(EXIT_SUCCESS);
+ } else if (string_match(optname, "version") || opt == 'V') {
fprintf(stdout, "%s\n", VERSION);
exit(EXIT_SUCCESS);
- case 'S':
+ } else if (string_match(optname, "sig-parent") || opt == 'S') {
opt_sig_parent = 1;
- break;
- case 'E':
- snprintf(kconsumer_data.err_unix_sock_path, PATH_MAX, "%s", arg);
- break;
- case 'C':
- snprintf(kconsumer_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
- break;
- case 'F':
- snprintf(ustconsumer64_data.err_unix_sock_path, PATH_MAX, "%s", arg);
- break;
- case 'D':
- snprintf(ustconsumer64_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
- break;
- case 'H':
- snprintf(ustconsumer32_data.err_unix_sock_path, PATH_MAX, "%s", arg);
- break;
- case 'G':
- snprintf(ustconsumer32_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
- break;
- case 'N':
+ } else if (string_match(optname, "kconsumerd-err-sock")) {
+ 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);
+ }
+ } else if (string_match(optname, "kconsumerd-cmd-sock")) {
+ 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);
+ }
+ } else if (string_match(optname, "ustconsumerd64-err-sock")) {
+ 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);
+ }
+ } else if (string_match(optname, "ustconsumerd64-cmd-sock")) {
+ 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);
+ }
+ } else if (string_match(optname, "ustconsumerd32-err-sock")) {
+ 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);
+ }
+ } else if (string_match(optname, "ustconsumerd32-cmd-sock")) {
+ 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);
+ }
+ } else if (string_match(optname, "no-kernel")) {
opt_no_kernel = 1;
- break;
- case 'q':
+ } else if (string_match(optname, "quiet") || opt == 'q') {
lttng_opt_quiet = 1;
- break;
- case 'v':
+ } else if (string_match(optname, "verbose") || opt == 'v') {
/* Verbose level can increase using multiple -v */
if (arg) {
/* Value obtained from config file */
/* Clamp value to [0, 3] */
lttng_opt_verbose = lttng_opt_verbose < 0 ? 0 :
(lttng_opt_verbose <= 3 ? lttng_opt_verbose : 3);
- break;
- case 'Z':
+ } else if (string_match(optname, "verbose-consumer")) {
if (arg) {
opt_verbose_consumer = config_parse_value(arg);
} else {
opt_verbose_consumer += 1;
}
- break;
- case 'u':
- if (consumerd32_bin_override) {
- free((void *) consumerd32_bin);
- }
- consumerd32_bin = strdup(arg);
- if (!consumerd32_bin) {
- perror("strdup");
- ret = -ENOMEM;
- }
- consumerd32_bin_override = 1;
- break;
- case 'U':
- if (consumerd32_libdir_override) {
- free((void *) consumerd32_libdir);
- }
- consumerd32_libdir = strdup(arg);
- if (!consumerd32_libdir) {
- perror("strdup");
- ret = -ENOMEM;
- }
- consumerd32_libdir_override = 1;
- break;
- case 't':
- if (consumerd64_bin_override) {
- free((void *) consumerd64_bin);
+ } else if (string_match(optname, "consumerd32-path")) {
+ 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) {
+ PERROR("strdup");
+ ret = -ENOMEM;
+ }
+ consumerd32_bin_override = 1;
}
- consumerd64_bin = strdup(arg);
- if (!consumerd64_bin) {
- perror("strdup");
- ret = -ENOMEM;
+ } else if (string_match(optname, "consumerd32-libdir")) {
+ 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) {
+ PERROR("strdup");
+ ret = -ENOMEM;
+ }
+ consumerd32_libdir_override = 1;
}
- consumerd64_bin_override = 1;
- break;
- case 'T':
- if (consumerd64_libdir_override) {
- free((void *) consumerd64_libdir);
+ } else if (string_match(optname, "consumerd64-path")) {
+ 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) {
+ PERROR("strdup");
+ ret = -ENOMEM;
+ }
+ consumerd64_bin_override = 1;
}
- consumerd64_libdir = strdup(arg);
- if (!consumerd64_libdir) {
- perror("strdup");
- ret = -ENOMEM;
+ } else if (string_match(optname, "consumerd64-libdir")) {
+ 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) {
+ PERROR("strdup");
+ ret = -ENOMEM;
+ }
+ consumerd64_libdir_override = 1;
}
- consumerd64_libdir_override = 1;
- break;
- case 'p':
- free(opt_pidfile);
- opt_pidfile = strdup(arg);
- if (!opt_pidfile) {
- perror("strdup");
- ret = -ENOMEM;
+ } else if (string_match(optname, "pidfile") || opt == 'p') {
+ 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) {
+ PERROR("strdup");
+ ret = -ENOMEM;
+ }
}
- break;
- case 'J': /* Agent TCP port. */
- {
- unsigned long v;
+ } else if (string_match(optname, "agent-tcp-port")) {
+ if (lttng_is_setuid_setgid()) {
+ WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
+ "--agent-tcp-port");
+ } else {
+ unsigned long v;
- errno = 0;
- v = strtoul(arg, NULL, 0);
- if (errno != 0 || !isdigit(arg[0])) {
- ERR("Wrong value in --agent-tcp-port parameter: %s", arg);
- return -1;
+ if (!arg) {
+ ret = -EINVAL;
+ goto end;
+ }
+ errno = 0;
+ v = strtoul(arg, NULL, 0);
+ if (errno != 0 || !isdigit(arg[0])) {
+ ERR("Wrong value in --agent-tcp-port parameter: %s", arg);
+ return -1;
+ }
+ if (v == 0 || v >= 65535) {
+ 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);
}
- if (v == 0 || v >= 65535) {
- ERR("Port overflow in --agent-tcp-port parameter: %s", arg);
- return -1;
+ } else if (string_match(optname, "load") || opt == 'l') {
+ 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) {
+ PERROR("strdup");
+ ret = -ENOMEM;
+ }
}
- agent_tcp_port = (uint32_t) v;
- DBG3("Agent TCP port set to non default: %u", agent_tcp_port);
- break;
- }
- case 'l':
- free(opt_load_session_path);
- opt_load_session_path = strdup(arg);
- if (!opt_load_session_path) {
- perror("strdup");
- ret = -ENOMEM;
+ } else if (string_match(optname, "kmod-probes")) {
+ 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) {
+ PERROR("strdup");
+ ret = -ENOMEM;
+ }
}
- break;
- case 'P': /* probe modules list */
- free(kmod_probes_list);
- kmod_probes_list = strdup(arg);
- if (!kmod_probes_list) {
- perror("strdup");
- ret = -ENOMEM;
+ } else if (string_match(optname, "extra-kmod-probes")) {
+ 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) {
+ PERROR("strdup");
+ ret = -ENOMEM;
+ }
}
- break;
- case 'f':
- /* This is handled in set_options() thus silent break. */
- break;
- default:
+ } else if (string_match(optname, "config") || opt == 'f') {
+ /* This is handled in set_options() thus silent skip. */
+ goto end;
+ } else {
/* Unknown option or other error.
* Error is printed by getopt, just return */
ret = -1;
}
+end:
+ if (ret == -EINVAL) {
+ const char *opt_name = "unknown";
+ int i;
+
+ for (i = 0; i < sizeof(long_options) / sizeof(struct option);
+ i++) {
+ if (opt == long_options[i].val) {
+ opt_name = long_options[i].name;
+ break;
+ }
+ }
+
+ WARN("Invalid argument provided for option \"%s\", using default value.",
+ opt_name);
+ }
+
return ret;
}
continue;
}
- config_path = utils_expand_path(optarg);
- if (!config_path) {
- ERR("Failed to resolve path: %s", optarg);
+ if (lttng_is_setuid_setgid()) {
+ WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
+ "-f, --config");
+ } else {
+ config_path = utils_expand_path(optarg);
+ if (!config_path) {
+ ERR("Failed to resolve path: %s", optarg);
+ }
}
}
optopt = orig_optopt;
optind = orig_optind;
while (1) {
- c = getopt_long(argc, argv, optstring, long_options, &option_index);
+ option_index = -1;
+ /*
+ * getopt_long() will not set option_index if it encounters a
+ * short option.
+ */
+ c = getopt_long(argc, argv, optstring, long_options,
+ &option_index);
if (c == -1) {
break;
}
- ret = set_option(c, optarg, long_options[option_index].name);
+ /*
+ * Pass NULL as the long option name if popt left the index
+ * unset.
+ */
+ ret = set_option(c, optarg,
+ option_index < 0 ? NULL :
+ long_options[option_index].name);
if (ret < 0) {
break;
}
/*
* Write pidfile using the rundir and opt_pidfile.
*/
-static void write_pidfile(void)
+static int write_pidfile(void)
{
int ret;
char pidfile_path[PATH_MAX];
}
/*
- * Create pid file in rundir. Return value is of no importance. The
- * execution will continue even though we are not able to write the file.
+ * Create pid file in rundir.
*/
- (void) utils_create_pid_file(getpid(), pidfile_path);
-
+ ret = utils_create_pid_file(getpid(), pidfile_path);
error:
- return;
+ return ret;
}
/*
/*
* Write agent TCP port using the rundir.
*/
-static void write_agent_port(void)
+static int write_agent_port(void)
{
int ret;
char path[PATH_MAX];
}
/*
- * Create TCP agent port file in rundir. Return value is of no importance.
- * The execution will continue even though we are not able to write the
- * file.
+ * Create TCP agent port file in rundir.
*/
- (void) utils_create_pid_file(agent_tcp_port, path);
+ ret = utils_create_pid_file(agent_tcp_port, path);
error:
- return;
-}
-
-/*
- * Start the load session thread and dettach from it so the main thread can
- * continue. This does not return a value since whatever the outcome, the main
- * thread will continue.
- */
-static void start_load_session_thread(void)
-{
- int ret;
-
- /* Create session loading thread. */
- ret = pthread_create(&load_session_thread, NULL, thread_load_session,
- load_info);
- if (ret != 0) {
- PERROR("pthread_create load_session_thread");
- goto error_create;
- }
-
- ret = pthread_detach(load_session_thread);
- if (ret != 0) {
- PERROR("pthread_detach load_session_thread");
- }
-
- /* Everything went well so don't cleanup anything. */
-
-error_create:
- /* The cleanup() function will destroy the load_info data. */
- return;
+ return ret;
}
/*
*/
int main(int argc, char **argv)
{
- int ret = 0;
+ int ret = 0, retval = 0;
void *status;
const char *home_path, *env_app_timeout;
rcu_register_thread();
- if ((ret = set_signal_handler()) < 0) {
- goto error;
+ if (set_signal_handler()) {
+ retval = -1;
+ goto exit_set_signal_handler;
}
setup_consumerd_path();
WARN("Fallback page size to %ld", page_size);
}
- /* Parse arguments and load the daemon configuration file */
+ /*
+ * Parse arguments and load the daemon configuration file.
+ *
+ * We have an exit_options exit path to free memory reserved by
+ * set_options. This is needed because the rest of sessiond_cleanup()
+ * depends on ht_cleanup_thread, which depends on lttng_daemonize, which
+ * depends on set_options.
+ */
progname = argv[0];
- if ((ret = set_options(argc, argv)) < 0) {
- goto error;
+ if (set_options(argc, argv)) {
+ retval = -1;
+ goto exit_options;
}
/* Daemonize */
ret = lttng_daemonize(&child_ppid, &recv_child_signal,
!opt_background);
if (ret < 0) {
- goto error;
+ 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.
+ * closed, in case we are called with more opened file
+ * descriptors than the standard ones.
*/
for (i = 3; i < sysconf(_SC_OPEN_MAX); i++) {
(void) close(i);
}
}
+ /*
+ * Starting from here, we can create threads. This needs to be after
+ * lttng_daemonize due to RCU.
+ */
+
+ /*
+ * Initialize the health check subsystem. This call should set the
+ * appropriate time values.
+ */
+ health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
+ if (!health_sessiond) {
+ PERROR("health_app_create error");
+ retval = -1;
+ 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");
+ retval = -1;
+ goto exit_ht_cleanup;
+ }
+
/* Create thread quit pipe */
- if ((ret = init_thread_quit_pipe()) < 0) {
- goto error;
+ if (init_thread_quit_pipe()) {
+ retval = -1;
+ goto exit_init_data;
}
/* Check if daemon is UID = 0 */
if (is_root) {
rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+ if (!rundir) {
+ retval = -1;
+ goto exit_init_data;
+ }
/* Create global run dir with root access */
- ret = create_lttng_rundir(rundir);
- if (ret < 0) {
- goto error;
+ if (create_lttng_rundir(rundir)) {
+ retval = -1;
+ goto exit_init_data;
}
if (strlen(apps_unix_sock_path) == 0) {
- snprintf(apps_unix_sock_path, PATH_MAX,
+ 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) {
- snprintf(client_unix_sock_path, PATH_MAX,
+ 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) {
- snprintf(wait_shm_path, PATH_MAX,
+ 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) {
- snprintf(health_unix_sock_path, sizeof(health_unix_sock_path),
+ 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 */
- snprintf(kconsumer_data.err_unix_sock_path, PATH_MAX,
+ ret = snprintf(kconsumer_data.err_unix_sock_path, PATH_MAX,
DEFAULT_KCONSUMERD_ERR_SOCK_PATH, rundir);
- snprintf(kconsumer_data.cmd_unix_sock_path, PATH_MAX,
+ 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);
if (home_path == NULL) {
/* TODO: Add --socket PATH option */
ERR("Can't get HOME directory for sockets creation.");
- ret = -EPERM;
- goto error;
+ retval = -1;
+ goto exit_init_data;
}
/*
*/
ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
if (ret < 0) {
- ret = -ENOMEM;
- goto error;
+ retval = -1;
+ goto exit_init_data;
}
- ret = create_lttng_rundir(rundir);
- if (ret < 0) {
- goto error;
+ if (create_lttng_rundir(rundir)) {
+ retval = -1;
+ goto exit_init_data;
}
if (strlen(apps_unix_sock_path) == 0) {
- snprintf(apps_unix_sock_path, PATH_MAX,
- DEFAULT_HOME_APPS_UNIX_SOCK, home_path);
+ 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) {
- snprintf(client_unix_sock_path, PATH_MAX,
- DEFAULT_HOME_CLIENT_UNIX_SOCK, home_path);
+ 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) {
- snprintf(wait_shm_path, PATH_MAX,
- DEFAULT_HOME_APPS_WAIT_SHM_PATH, getuid());
+ 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) {
- snprintf(health_unix_sock_path, sizeof(health_unix_sock_path),
- DEFAULT_HOME_HEALTH_UNIX_SOCK, home_path);
+ 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) {
- goto error;
+ retval = -1;
+ goto exit_init_data;
}
/* Set consumer initial state */
DBG("LTTng run directory path: %s", rundir);
/* 32 bits consumerd path setup */
- snprintf(ustconsumer32_data.err_unix_sock_path, PATH_MAX,
+ ret = snprintf(ustconsumer32_data.err_unix_sock_path, PATH_MAX,
DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH, rundir);
- snprintf(ustconsumer32_data.cmd_unix_sock_path, PATH_MAX,
+ if (ret < 0) {
+ PERROR("snprintf 32-bit consumer error socket path");
+ 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");
+ retval = -1;
+ goto exit_init_data;
+ }
DBG2("UST consumer 32 bits err path: %s",
ustconsumer32_data.err_unix_sock_path);
ustconsumer32_data.cmd_unix_sock_path);
/* 64 bits consumerd path setup */
- snprintf(ustconsumer64_data.err_unix_sock_path, PATH_MAX,
+ ret = snprintf(ustconsumer64_data.err_unix_sock_path, PATH_MAX,
DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH, rundir);
- snprintf(ustconsumer64_data.cmd_unix_sock_path, PATH_MAX,
+ if (ret < 0) {
+ PERROR("snprintf 64-bit consumer error socket path");
+ 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");
+ retval = -1;
+ goto exit_init_data;
+ }
DBG2("UST consumer 64 bits err path: %s",
ustconsumer64_data.err_unix_sock_path);
/*
* See if daemon already exist.
*/
- if ((ret = check_existing_daemon()) < 0) {
+ 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.
*/
- goto error;
+ retval = -1;
+ goto exit_init_data;
}
/*
* Init UST app hash table. Alloc hash table before this point since
* cleanup() can get called after that point.
*/
- ust_app_ht_alloc();
-
- /* Initialize agent domain subsystem. */
- if ((ret = agent_setup()) < 0) {
- /* ENOMEM at this point. */
- goto error;
+ if (ust_app_ht_alloc()) {
+ ERR("Failed to allocate UST app hash table");
+ retval = -1;
+ goto exit_init_data;
}
- /* After this point, we can safely call cleanup() with "goto exit" */
+ /*
+ * Initialize agent app hash table. We allocate the hash table here
+ * since cleanup() can get called after this point.
+ */
+ if (agent_app_ht_alloc()) {
+ ERR("Failed to allocate Agent app hash table");
+ retval = -1;
+ goto exit_init_data;
+ }
/*
* These actions must be executed as root. We do that *after* setting up
* kernel tracer.
*/
if (is_root) {
- ret = set_consumer_sockets(&kconsumer_data, rundir);
- if (ret < 0) {
- goto exit;
+ if (set_consumer_sockets(&kconsumer_data, rundir)) {
+ retval = -1;
+ goto exit_init_data;
}
/* Setup kernel tracer */
if (!opt_no_kernel) {
init_kernel_tracer();
+ if (kernel_tracer_fd >= 0) {
+ ret = syscall_init_table();
+ if (ret < 0) {
+ ERR("Unable to populate syscall table. "
+ "Syscall tracing won't work "
+ "for this session daemon.");
+ }
+ }
}
/* Set ulimit for open files */
/* init lttng_fd tracking must be done after set_ulimit. */
lttng_fd_init();
- ret = set_consumer_sockets(&ustconsumer64_data, rundir);
- if (ret < 0) {
- goto exit;
+ if (set_consumer_sockets(&ustconsumer64_data, rundir)) {
+ retval = -1;
+ goto exit_init_data;
}
- ret = set_consumer_sockets(&ustconsumer32_data, rundir);
- if (ret < 0) {
- goto exit;
+ if (set_consumer_sockets(&ustconsumer32_data, rundir)) {
+ retval = -1;
+ goto exit_init_data;
}
/* Setup the needed unix socket */
- if ((ret = init_daemon_socket()) < 0) {
- goto exit;
+ if (init_daemon_socket()) {
+ retval = -1;
+ goto exit_init_data;
}
/* Set credentials to socket */
- if (is_root && ((ret = set_permissions(rundir)) < 0)) {
- goto exit;
+ if (is_root && set_permissions(rundir)) {
+ retval = -1;
+ goto exit_init_data;
}
/* Get parent pid if -S, --sig-parent is specified. */
/* Setup the kernel pipe for waking up the kernel thread */
if (is_root && !opt_no_kernel) {
- if ((ret = utils_create_pipe_cloexec(kernel_poll_pipe)) < 0) {
- goto exit;
+ if (utils_create_pipe_cloexec(kernel_poll_pipe)) {
+ retval = -1;
+ goto exit_init_data;
}
}
- /* Setup the thread ht_cleanup communication pipe. */
- if (utils_create_pipe_cloexec(ht_cleanup_pipe) < 0) {
- goto exit;
- }
-
/* Setup the thread apps communication pipe. */
- if ((ret = utils_create_pipe_cloexec(apps_cmd_pipe)) < 0) {
- goto exit;
+ if (utils_create_pipe_cloexec(apps_cmd_pipe)) {
+ retval = -1;
+ goto exit_init_data;
}
/* Setup the thread apps notify communication pipe. */
- if (utils_create_pipe_cloexec(apps_cmd_notify_pipe) < 0) {
- goto exit;
+ if (utils_create_pipe_cloexec(apps_cmd_notify_pipe)) {
+ retval = -1;
+ goto exit_init_data;
}
/* Initialize global buffer per UID and PID registry. */
cds_wfcq_init(&ust_cmd_queue.head, &ust_cmd_queue.tail);
/*
- * Get session list pointer. This pointer MUST NOT be free(). This list is
- * statically declared in session.c
+ * Get session list pointer. This pointer MUST NOT be free'd. This list
+ * is statically declared in session.c
*/
session_list_ptr = session_get_list();
- /* Set up max poll set size */
- lttng_poll_set_max_size();
-
cmd_init();
/* Check for the application socket timeout env variable. */
app_socket_timeout = DEFAULT_APP_SOCKET_RW_TIMEOUT;
}
- write_pidfile();
- write_agent_port();
+ ret = write_pidfile();
+ if (ret) {
+ ERR("Error in 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();
- /* This is to get the TCP timeout value. */
+ /* Initialize TCP timeout values */
lttcomm_inet_init();
if (load_session_init_data(&load_info) < 0) {
- goto exit;
+ retval = -1;
+ goto exit_init_data;
}
load_info->path = opt_load_session_path;
- /*
- * Initialize the health check subsystem. This call should set the
- * appropriate time values.
- */
- health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
- if (!health_sessiond) {
- PERROR("health_app_create error");
- goto exit_health_sessiond_cleanup;
- }
-
- /* Create thread to clean up RCU hash tables */
- ret = pthread_create(&ht_cleanup_thread, NULL,
- thread_ht_cleanup, (void *) NULL);
- if (ret != 0) {
- PERROR("pthread_create ht_cleanup");
- goto exit_ht_cleanup;
- }
-
/* Create health-check thread */
ret = pthread_create(&health_thread, NULL,
thread_manage_health, (void *) NULL);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_create health");
+ retval = -1;
goto exit_health;
}
/* Create thread to manage the client socket */
ret = pthread_create(&client_thread, NULL,
thread_manage_clients, (void *) NULL);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_create clients");
+ retval = -1;
goto exit_client;
}
/* Create thread to dispatch registration */
ret = pthread_create(&dispatch_thread, NULL,
thread_dispatch_ust_registration, (void *) NULL);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_create dispatch");
+ retval = -1;
goto exit_dispatch;
}
/* Create thread to manage application registration. */
ret = pthread_create(®_apps_thread, NULL,
thread_registration_apps, (void *) NULL);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_create registration");
+ retval = -1;
goto exit_reg_apps;
}
/* Create thread to manage application socket */
ret = pthread_create(&apps_thread, NULL,
thread_manage_apps, (void *) NULL);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_create apps");
+ retval = -1;
goto exit_apps;
}
/* Create thread to manage application notify socket */
ret = pthread_create(&apps_notify_thread, NULL,
ust_thread_manage_notify, (void *) NULL);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_create notify");
+ retval = -1;
goto exit_apps_notify;
}
/* Create agent registration thread. */
ret = pthread_create(&agent_reg_thread, NULL,
agent_thread_manage_registration, (void *) NULL);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_create agent");
+ retval = -1;
goto exit_agent_reg;
}
/* Create kernel thread to manage kernel event */
ret = pthread_create(&kernel_thread, NULL,
thread_manage_kernel, (void *) NULL);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_create kernel");
+ retval = -1;
goto exit_kernel;
}
}
- /* Load possible session(s). */
- start_load_session_thread();
+ /* Create session loading thread. */
+ ret = pthread_create(&load_session_thread, NULL, thread_load_session,
+ load_info);
+ if (ret) {
+ errno = ret;
+ PERROR("pthread_create load_session_thread");
+ retval = -1;
+ goto exit_load_session;
+ }
+
+ /*
+ * This is where we start awaiting program completion (e.g. through
+ * signal that asks threads to teardown).
+ */
+
+ ret = pthread_join(load_session_thread, &status);
+ if (ret) {
+ errno = ret;
+ PERROR("pthread_join load_session_thread");
+ retval = -1;
+ }
+exit_load_session:
if (is_root && !opt_no_kernel) {
ret = pthread_join(kernel_thread, &status);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_join");
- goto error; /* join error, exit without cleanup */
+ retval = -1;
}
}
-
exit_kernel:
+
ret = pthread_join(agent_reg_thread, &status);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_join agent");
- goto error; /* join error, exit without cleanup */
+ retval = -1;
}
-
exit_agent_reg:
+
ret = pthread_join(apps_notify_thread, &status);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_join apps notify");
- goto error; /* join error, exit without cleanup */
+ retval = -1;
}
-
exit_apps_notify:
+
ret = pthread_join(apps_thread, &status);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_join apps");
- goto error; /* join error, exit without cleanup */
+ retval = -1;
}
-
-
exit_apps:
+
ret = pthread_join(reg_apps_thread, &status);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_join");
- goto error; /* join error, exit without cleanup */
+ retval = -1;
}
-
exit_reg_apps:
+
ret = pthread_join(dispatch_thread, &status);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_join");
- goto error; /* join error, exit without cleanup */
+ retval = -1;
}
-
exit_dispatch:
+
ret = pthread_join(client_thread, &status);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_join");
- goto error; /* join error, exit without cleanup */
- }
-
- ret = join_consumer_thread(&kconsumer_data);
- if (ret != 0) {
- PERROR("join_consumer");
- goto error; /* join error, exit without cleanup */
+ retval = -1;
}
+exit_client:
- ret = join_consumer_thread(&ustconsumer32_data);
- if (ret != 0) {
- PERROR("join_consumer ust32");
- goto error; /* join error, exit without cleanup */
+ ret = pthread_join(health_thread, &status);
+ if (ret) {
+ errno = ret;
+ PERROR("pthread_join health thread");
+ retval = -1;
}
+exit_health:
- ret = join_consumer_thread(&ustconsumer64_data);
- if (ret != 0) {
- PERROR("join_consumer ust64");
- goto error; /* join error, exit without cleanup */
- }
+exit_init_data:
+ /*
+ * 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();
-exit_client:
- ret = pthread_join(health_thread, &status);
- if (ret != 0) {
- PERROR("pthread_join health thread");
- goto error; /* join error, exit without cleanup */
+ ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
+ if (ret < 0) {
+ ERR("write error on ht_cleanup quit pipe");
+ retval = -1;
}
-exit_health:
ret = pthread_join(ht_cleanup_thread, &status);
- if (ret != 0) {
+ if (ret) {
+ errno = ret;
PERROR("pthread_join ht cleanup thread");
- goto error; /* join error, exit without cleanup */
+ retval = -1;
}
exit_ht_cleanup:
- health_app_destroy(health_sessiond);
-exit_health_sessiond_cleanup:
-exit:
+exit_set_max_size:
+
+ utils_close_pipe(ht_cleanup_pipe);
+exit_ht_cleanup_pipe:
+
/*
- * cleanup() is called when no other thread is running.
+ * Close the ht_cleanup quit pipe.
*/
- rcu_thread_online();
- cleanup();
- rcu_thread_offline();
- rcu_unregister_thread();
- if (!ret) {
+ utils_close_pipe(ht_cleanup_quit_pipe);
+exit_ht_cleanup_quit_pipe:
+
+ health_app_destroy(health_sessiond);
+exit_health_sessiond_cleanup:
+
+exit_options:
+ sessiond_cleanup_options();
+
+exit_set_signal_handler:
+ if (!retval) {
exit(EXIT_SUCCESS);
+ } else {
+ exit(EXIT_FAILURE);
}
-error:
- exit(EXIT_FAILURE);
}
projects / lttng-tools.git / blobdiff