#include <getopt.h>
#include <grp.h>
#include <limits.h>
+#include <poll.h>
#include <pthread.h>
#include <semaphore.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ipc.h>
+#include <sys/mount.h>
#include <sys/shm.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include <unistd.h>
#include <urcu/list.h> /* URCU list library (-lurcu) */
-#include <ust/ustctl.h> /* UST control lib (-lust) */
#include <lttng/lttng.h>
#include "liblttsessiondcomm.h"
#include "session.h"
#include "traceable-app.h"
#include "lttng-kconsumerd.h"
+#include "libustctl.h"
+#include "utils.h"
/*
* TODO:
static int is_root; /* Set to 1 if the daemon is running as root */
static pid_t ppid; /* Parent PID for --sig-parent option */
static pid_t kconsumerd_pid;
+static struct pollfd *kernel_pollfd;
static char apps_unix_sock_path[PATH_MAX]; /* Global application Unix socket path */
static char client_unix_sock_path[PATH_MAX]; /* Global client Unix socket path */
static int kconsumerd_err_sock;
static int kconsumerd_cmd_sock;
static int kernel_tracer_fd;
+static int kernel_poll_pipe[2];
/* Pthread, Mutexes and Semaphores */
static pthread_t kconsumerd_thread;
static pthread_t apps_thread;
static pthread_t client_thread;
+static pthread_t kernel_thread;
static sem_t kconsumerd_sem;
static pthread_mutex_t kconsumerd_pid_mutex; /* Mutex to control kconsumerd pid assignation */
+/*
+ * Pointer initialized before thread creation.
+ *
+ * This points to the tracing session list containing the session count and a
+ * mutex lock. The lock MUST be taken if you iterate over the list. The lock
+ * MUST NOT be taken if you call a public function in session.c.
+ */
+static struct ltt_session_list *session_list_ptr;
+
/*
* teardown_kernel_session
*
- * Complete teardown of a kernel session. This free all data structure
- * related to a kernel session and update counter.
+ * Complete teardown of a kernel session. This free all data structure related
+ * to a kernel session and update counter.
*/
static void teardown_kernel_session(struct ltt_session *session)
{
trace_destroy_kernel_session(session->kernel_session);
/* Extra precaution */
session->kernel_session = NULL;
- /* Decrement session count */
- session->kern_session_count--;
}
}
DBG("Terminating all threads");
pthread_cancel(client_thread);
pthread_cancel(apps_thread);
+ pthread_cancel(kernel_thread);
if (kconsumerd_pid != 0) {
pthread_cancel(kconsumerd_thread);
}
DBG("Cleaning up all session");
/* Cleanup ALL session */
- cds_list_for_each_entry(sess, <t_session_list.head, list) {
+ cds_list_for_each_entry(sess, &session_list_ptr->head, list) {
teardown_kernel_session(sess);
// TODO complete session cleanup (including UST)
}
+ /* Destroy session list mutex */
+ pthread_mutex_destroy(&session_list_ptr->lock);
+
+ DBG("Closing kernel fd");
close(kernel_tracer_fd);
+ close(kernel_poll_pipe[0]);
+ close(kernel_poll_pipe[1]);
}
/*
}
}
+/*
+ * send_kconsumerd_channel_fds
+ *
+ * Send all stream fds of kernel channel to the consumer.
+ */
+static int send_kconsumerd_channel_fds(int sock, struct ltt_kernel_channel *channel)
+{
+ int ret;
+ size_t nb_fd;
+ struct ltt_kernel_stream *stream;
+ struct lttcomm_kconsumerd_header lkh;
+ struct lttcomm_kconsumerd_msg lkm;
+
+ DBG("Sending fds of channel %s to kernel consumer", channel->channel->name);
+
+ nb_fd = channel->stream_count;
+
+ /* Setup header */
+ lkh.payload_size = nb_fd * sizeof(struct lttcomm_kconsumerd_msg);
+ lkh.cmd_type = ADD_STREAM;
+
+ DBG("Sending kconsumerd header");
+
+ ret = lttcomm_send_unix_sock(sock, &lkh, sizeof(struct lttcomm_kconsumerd_header));
+ if (ret < 0) {
+ perror("send kconsumerd header");
+ goto error;
+ }
+
+ cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
+ if (stream->fd != 0) {
+ lkm.fd = stream->fd;
+ lkm.state = stream->state;
+ lkm.max_sb_size = channel->channel->attr.subbuf_size;
+ strncpy(lkm.path_name, stream->pathname, PATH_MAX);
+
+ DBG("Sending fd %d to kconsumerd", lkm.fd);
+
+ ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm));
+ if (ret < 0) {
+ perror("send kconsumerd fd");
+ goto error;
+ }
+ }
+ }
+
+ DBG("Kconsumerd channel fds sent");
+
+ return 0;
+
+error:
+ return ret;
+}
+
+/*
+ * send_kconsumerd_fds
+ *
+ * Send all stream fds of the kernel session to the consumer.
+ */
+static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session)
+{
+ int ret;
+ struct ltt_kernel_channel *chan;
+ struct lttcomm_kconsumerd_header lkh;
+ struct lttcomm_kconsumerd_msg lkm;
+
+ /* Setup header */
+ lkh.payload_size = sizeof(struct lttcomm_kconsumerd_msg);
+ lkh.cmd_type = ADD_STREAM;
+
+ DBG("Sending kconsumerd header for metadata");
+
+ ret = lttcomm_send_unix_sock(sock, &lkh, sizeof(struct lttcomm_kconsumerd_header));
+ if (ret < 0) {
+ perror("send kconsumerd header");
+ goto error;
+ }
+
+ DBG("Sending metadata stream fd");
+
+ if (session->metadata_stream_fd != 0) {
+ /* Send metadata stream fd first */
+ lkm.fd = session->metadata_stream_fd;
+ lkm.state = ACTIVE_FD;
+ lkm.max_sb_size = session->metadata->conf->attr.subbuf_size;
+ strncpy(lkm.path_name, session->metadata->pathname, PATH_MAX);
+
+ ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm));
+ if (ret < 0) {
+ perror("send kconsumerd fd");
+ goto error;
+ }
+ }
+
+ cds_list_for_each_entry(chan, &session->channel_list.head, list) {
+ ret = send_kconsumerd_channel_fds(sock, chan);
+ if (ret < 0) {
+ goto error;
+ }
+ }
+
+ DBG("Kconsumerd fds (metadata and channel streams) sent");
+
+ return 0;
+
+error:
+ return ret;
+}
+
/*
* ust_connect_app
*
sock = ustctl_connect_pid(lta->pid);
if (sock < 0) {
- ERR("Fail connecting to the PID %d\n", pid);
+ ERR("Fail connecting to the PID %d", pid);
}
return sock;
*/
static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size)
{
- int ret, buf_size, trace_name_size;
+ int ret, buf_size;
- /*
- * Check for the trace_name. If defined, it's part of the payload data of
- * the llm structure.
- */
- trace_name_size = strlen(cmd_ctx->lsm->trace_name);
- buf_size = trace_name_size + size;
+ buf_size = size;
cmd_ctx->llm = malloc(sizeof(struct lttcomm_lttng_msg) + buf_size);
if (cmd_ctx->llm == NULL) {
/* Copy common data */
cmd_ctx->llm->cmd_type = cmd_ctx->lsm->cmd_type;
cmd_ctx->llm->pid = cmd_ctx->lsm->pid;
- if (!uuid_is_null(cmd_ctx->lsm->session_uuid)) {
- uuid_copy(cmd_ctx->llm->session_uuid, cmd_ctx->lsm->session_uuid);
- }
- cmd_ctx->llm->trace_name_offset = trace_name_size;
cmd_ctx->llm->data_size = size;
cmd_ctx->lttng_msg_size = sizeof(struct lttcomm_lttng_msg) + buf_size;
- /* Copy trace name to the llm structure. Begining of the payload. */
- memcpy(cmd_ctx->llm->payload, cmd_ctx->lsm->trace_name, trace_name_size);
-
return buf_size;
error:
return ret;
}
+/*
+ * update_kernel_pollfd
+ *
+ * Update the kernel pollfd set of all channel fd available over
+ * all tracing session. Add the wakeup pipe at the end of the set.
+ */
+static int update_kernel_pollfd(void)
+{
+ int i = 0;
+ unsigned int nb_fd = 1;
+ struct ltt_session *session;
+ struct ltt_kernel_channel *channel;
+
+ DBG("Updating kernel_pollfd");
+
+ /* Get the number of channel of all kernel session */
+ pthread_mutex_lock(&session_list_ptr->lock);
+ cds_list_for_each_entry(session, &session_list_ptr->head, list) {
+ lock_session(session);
+ if (session->kernel_session == NULL) {
+ unlock_session(session);
+ continue;
+ }
+ nb_fd += session->kernel_session->channel_count;
+ unlock_session(session);
+ }
+
+ DBG("Resizing kernel_pollfd to size %d", nb_fd);
+
+ kernel_pollfd = realloc(kernel_pollfd, nb_fd * sizeof(struct pollfd));
+ if (kernel_pollfd == NULL) {
+ perror("malloc kernel_pollfd");
+ goto error;
+ }
+
+ cds_list_for_each_entry(session, &session_list_ptr->head, list) {
+ lock_session(session);
+ if (session->kernel_session == NULL) {
+ unlock_session(session);
+ continue;
+ }
+ if (i >= nb_fd) {
+ ERR("To much channel for kernel_pollfd size");
+ unlock_session(session);
+ break;
+ }
+ cds_list_for_each_entry(channel, &session->kernel_session->channel_list.head, list) {
+ kernel_pollfd[i].fd = channel->fd;
+ kernel_pollfd[i].events = POLLIN | POLLRDNORM;
+ i++;
+ }
+ unlock_session(session);
+ }
+ pthread_mutex_unlock(&session_list_ptr->lock);
+
+ /* Adding wake up pipe */
+ kernel_pollfd[nb_fd - 1].fd = kernel_poll_pipe[0];
+ kernel_pollfd[nb_fd - 1].events = POLLIN;
+
+ return nb_fd;
+
+error:
+ pthread_mutex_unlock(&session_list_ptr->lock);
+ return -1;
+}
+
+/*
+ * update_kernel_stream
+ *
+ * Find the channel fd from 'fd' over all tracing session. When found, check
+ * for new channel stream and send those stream fds to the kernel consumer.
+ *
+ * Useful for CPU hotplug feature.
+ */
+static int update_kernel_stream(int fd)
+{
+ int ret = 0;
+ struct ltt_session *session;
+ struct ltt_kernel_channel *channel;
+
+ DBG("Updating kernel streams for channel fd %d", fd);
+
+ pthread_mutex_lock(&session_list_ptr->lock);
+ cds_list_for_each_entry(session, &session_list_ptr->head, list) {
+ lock_session(session);
+ if (session->kernel_session == NULL) {
+ unlock_session(session);
+ continue;
+ }
+ cds_list_for_each_entry(channel, &session->kernel_session->channel_list.head, list) {
+ if (channel->fd == fd) {
+ DBG("Channel found, updating kernel streams");
+ ret = kernel_open_channel_stream(channel);
+ if (ret < 0) {
+ goto end;
+ }
+ /*
+ * Have we already sent fds to the consumer? If yes, it means that
+ * tracing is started so it is safe to send our updated stream fds.
+ */
+ if (session->kernel_session->kconsumer_fds_sent == 1) {
+ ret = send_kconsumerd_channel_fds(kconsumerd_cmd_sock, channel);
+ if (ret < 0) {
+ goto end;
+ }
+ }
+ goto end;
+ }
+ }
+ unlock_session(session);
+ }
+
+end:
+ if (session) {
+ unlock_session(session);
+ }
+ pthread_mutex_unlock(&session_list_ptr->lock);
+ return ret;
+}
+
+/*
+ * thread_manage_kernel
+ *
+ * This thread manage event coming from the kernel.
+ *
+ * Features supported in this thread:
+ * -) CPU Hotplug
+ */
+static void *thread_manage_kernel(void *data)
+{
+ int ret, i, nb_fd = 0;
+ char tmp;
+ int update_poll_flag = 1;
+
+ DBG("Thread manage kernel started");
+
+ while (1) {
+ if (update_poll_flag == 1) {
+ nb_fd = update_kernel_pollfd();
+ if (nb_fd < 0) {
+ goto error;
+ }
+ update_poll_flag = 0;
+ }
+
+ DBG("Polling on %d fds", nb_fd);
+
+ /* Poll infinite value of time */
+ ret = poll(kernel_pollfd, nb_fd, -1);
+ if (ret < 0) {
+ perror("poll kernel thread");
+ goto error;
+ } else if (ret == 0) {
+ /* Should not happen since timeout is infinite */
+ continue;
+ }
+
+ DBG("Kernel poll event triggered");
+
+ /*
+ * Check if the wake up pipe was triggered. If so, the kernel_pollfd
+ * must be updated.
+ */
+ switch (kernel_pollfd[nb_fd - 1].revents) {
+ case POLLIN:
+ ret = read(kernel_poll_pipe[0], &tmp, 1);
+ update_poll_flag = 1;
+ continue;
+ case POLLERR:
+ goto error;
+ default:
+ break;
+ }
+
+ for (i = 0; i < nb_fd; i++) {
+ switch (kernel_pollfd[i].revents) {
+ /*
+ * New CPU detected by the kernel. Adding kernel stream to kernel
+ * session and updating the kernel consumer
+ */
+ case POLLIN | POLLRDNORM:
+ ret = update_kernel_stream(kernel_pollfd[i].fd);
+ if (ret < 0) {
+ continue;
+ }
+ break;
+ }
+ }
+ }
+
+error:
+ DBG("Kernel thread dying");
+ if (kernel_pollfd) {
+ free(kernel_pollfd);
+ }
+ return NULL;
+}
+
/*
* thread_manage_kconsumerd
*
/*
* Exec kconsumerd.
*/
- execlp("kconsumerd", "kconsumerd", "--quiet", NULL);
+ execlp("ltt-kconsumerd", "ltt-kconsumerd", "--verbose", NULL);
if (errno != 0) {
perror("kernel start consumer exec");
}
}
/*
- * send_kconsumerd_fds
- *
- * Send all stream fds of the kernel session to the consumer.
+ * modprobe_kernel_modules
*/
-static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session)
+static int modprobe_kernel_modules(void)
{
- int ret;
- size_t nb_fd;
- struct ltt_kernel_stream *stream;
- struct ltt_kernel_channel *chan;
- struct lttcomm_kconsumerd_header lkh;
- struct lttcomm_kconsumerd_msg lkm;
+ int ret = 0, i = 0;
+ char modprobe[256];
- nb_fd = session->stream_count_global;
+ while (kernel_modules_list[i] != NULL) {
+ ret = snprintf(modprobe, sizeof(modprobe), "/sbin/modprobe %s",
+ kernel_modules_list[i]);
+ if (ret < 0) {
+ perror("snprintf modprobe");
+ goto error;
+ }
+ ret = system(modprobe);
+ if (ret < 0) {
+ ERR("Unable to load module %s", kernel_modules_list[i]);
+ }
+ DBG("Modprobe successfully %s", kernel_modules_list[i]);
+ i++;
+ }
- /* Setup header */
- lkh.payload_size = (nb_fd + 1) * sizeof(struct lttcomm_kconsumerd_msg);
- lkh.cmd_type = ADD_STREAM;
+error:
+ return ret;
+}
- DBG("Sending kconsumerd header");
+/*
+ * mount_debugfs
+ */
+static int mount_debugfs(char *path)
+{
+ int ret;
+ char *type = "debugfs";
- ret = lttcomm_send_unix_sock(sock, &lkh, sizeof(struct lttcomm_kconsumerd_header));
+ ret = mkdir_recursive(path, S_IRWXU | S_IRWXG);
if (ret < 0) {
- perror("send kconsumerd header");
goto error;
}
- DBG("Sending metadata stream fd");
+ ret = mount(type, path, type, 0, NULL);
+ if (ret < 0) {
+ perror("mount debugfs");
+ goto error;
+ }
- /* Send metadata stream fd first */
- lkm.fd = session->metadata_stream_fd;
- lkm.state = ACTIVE_FD;
- lkm.max_sb_size = session->metadata->conf->subbuf_size;
- strncpy(lkm.path_name, session->metadata->pathname, PATH_MAX);
+ DBG("Mounted debugfs successfully at %s", path);
- ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm));
- if (ret < 0) {
- perror("send kconsumerd fd");
+error:
+ return ret;
+}
+
+/*
+ * init_kernel_tracer
+ *
+ * Setup necessary data for kernel tracer action.
+ */
+static void init_kernel_tracer(void)
+{
+ int ret;
+ char *proc_mounts = "/proc/mounts";
+ char line[256];
+ char *debugfs_path = NULL, *lttng_path;
+ FILE *fp;
+
+ /* Detect debugfs */
+ fp = fopen(proc_mounts, "r");
+ if (fp == NULL) {
+ ERR("Unable to probe %s", proc_mounts);
goto error;
}
- cds_list_for_each_entry(chan, &session->channel_list.head, list) {
- cds_list_for_each_entry(stream, &chan->stream_list.head, list) {
- lkm.fd = stream->fd;
- lkm.state = stream->state;
- lkm.max_sb_size = chan->channel->subbuf_size;
- strncpy(lkm.path_name, stream->pathname, PATH_MAX);
+ while (fgets(line, sizeof(line), fp) != NULL) {
+ if (strstr(line, "debugfs") != NULL) {
+ /* Remove first string */
+ strtok(line, " ");
+ /* Dup string here so we can reuse line later on */
+ debugfs_path = strdup(strtok(NULL, " "));
+ DBG("Got debugfs path : %s", debugfs_path);
+ break;
+ }
+ }
- DBG("Sending fd %d to kconsumerd", lkm.fd);
+ fclose(fp);
- ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm));
- if (ret < 0) {
- perror("send kconsumerd fd");
- goto error;
- }
+ /* Mount debugfs if needded */
+ if (debugfs_path == NULL) {
+ ret = asprintf(&debugfs_path, "/mnt/debugfs");
+ if (ret < 0) {
+ perror("asprintf debugfs path");
+ goto error;
+ }
+ ret = mount_debugfs(debugfs_path);
+ if (ret < 0) {
+ goto error;
}
}
- DBG("Kconsumerd fds sent");
+ /* Modprobe lttng kernel modules */
+ ret = modprobe_kernel_modules();
+ if (ret < 0) {
+ goto error;
+ }
- return 0;
+ /* Setup lttng kernel path */
+ ret = asprintf(<tng_path, "%s/lttng", debugfs_path);
+ if (ret < 0) {
+ perror("asprintf lttng path");
+ goto error;
+ }
+
+ /* Open debugfs lttng */
+ kernel_tracer_fd = open(lttng_path, O_RDWR);
+ if (kernel_tracer_fd < 0) {
+ DBG("Failed to open %s", lttng_path);
+ goto error;
+ }
+
+ free(lttng_path);
+ free(debugfs_path);
+ DBG("Kernel tracer fd %d", kernel_tracer_fd);
+ return;
error:
- return ret;
+ if (lttng_path) {
+ free(lttng_path);
+ }
+ if (debugfs_path) {
+ free(debugfs_path);
+ }
+ WARN("No kernel tracer available");
+ kernel_tracer_fd = 0;
+ return;
}
/*
- * create_trace_dir
+ * start_kernel_trace
*
- * Create the trace output directory.
+ * Start tracing by creating trace directory and sending FDs to the kernel
+ * consumer.
*/
-static int create_trace_dir(struct ltt_kernel_session *session)
+static int start_kernel_trace(struct ltt_kernel_session *session)
{
int ret;
- struct ltt_kernel_channel *chan;
- /* Create all channel directories */
- cds_list_for_each_entry(chan, &session->channel_list.head, list) {
- DBG("Creating trace directory at %s", chan->pathname);
- ret = mkdir(chan->pathname, S_IRWXU | S_IRWXG );
+ if (session->kconsumer_fds_sent == 0) {
+ ret = send_kconsumerd_fds(kconsumerd_cmd_sock, session);
if (ret < 0) {
- perror("mkdir trace path");
- ret = -errno;
+ ERR("Send kconsumerd fds failed");
+ ret = LTTCOMM_KERN_CONSUMER_FAIL;
goto error;
}
+
+ session->kconsumer_fds_sent = 1;
}
- return 0;
+error:
+ return ret;
+}
+
+/*
+ * Notify kernel thread to update it's pollfd.
+ */
+static int notify_kernel_pollfd(void)
+{
+ int ret;
+
+ /* Inform kernel thread of the new kernel channel */
+ ret = write(kernel_poll_pipe[1], "!", 1);
+ if (ret < 0) {
+ perror("write kernel poll pipe");
+ }
+
+ return ret;
+}
+
+/*
+ * init_default_channel
+ *
+ * Allocate a channel structure and fill it.
+ */
+static struct lttng_channel *init_default_channel(void)
+{
+ struct lttng_channel *chan;
+
+ chan = malloc(sizeof(struct lttng_channel));
+ if (chan == NULL) {
+ perror("init channel malloc");
+ goto error;
+ }
+
+ if (snprintf(chan->name, NAME_MAX, DEFAULT_CHANNEL_NAME) < 0) {
+ perror("snprintf defautl channel name");
+ return NULL;
+ }
+
+ chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
+ chan->attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE;
+ chan->attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM;
+ chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
+ chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+ chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
+
+error:
+ return chan;
+}
+
+/*
+ * create_kernel_session
+ *
+ * Create a kernel tracer session then create the default channel.
+ */
+static int create_kernel_session(struct ltt_session *session)
+{
+ int ret;
+ struct lttng_channel *chan;
+
+ DBG("Creating kernel session");
+
+ ret = kernel_create_session(session, kernel_tracer_fd);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_SESS_FAIL;
+ goto error;
+ }
+
+ chan = init_default_channel();
+ if (chan == NULL) {
+ ret = LTTCOMM_FATAL;
+ goto error;
+ }
+
+ ret = mkdir_recursive(session->path, S_IRWXU | S_IRWXG );
+ if (ret < 0) {
+ if (ret != EEXIST) {
+ ERR("Trace directory creation error");
+ goto error;
+ }
+ }
+
+ DBG("Creating default kernel channel %s", DEFAULT_CHANNEL_NAME);
+
+ ret = kernel_create_channel(session->kernel_session, chan, session->path);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_CHAN_FAIL;
+ goto error;
+ }
+
+ ret = notify_kernel_pollfd();
error:
return ret;
{
int ret;
- DBG("Processing client command %d", cmd_ctx->lsm->cmd_type);
+ DBG("Processing client command %d", cmd_ctx->lsm->cmd_type);
+
+ /* Listing commands don't need a session */
+ switch (cmd_ctx->lsm->cmd_type) {
+ case LTTNG_CREATE_SESSION:
+ case LTTNG_LIST_SESSIONS:
+ case LTTNG_LIST_EVENTS:
+ case LTTNG_KERNEL_LIST_EVENTS:
+ case LTTNG_LIST_TRACEABLE_APPS:
+ break;
+ default:
+ DBG("Getting session %s by name", cmd_ctx->lsm->session_name);
+ cmd_ctx->session = find_session_by_name(cmd_ctx->lsm->session_name);
+ if (cmd_ctx->session == NULL) {
+ /* If session name not found */
+ if (cmd_ctx->lsm->session_name != NULL) {
+ ret = LTTCOMM_SESS_NOT_FOUND;
+ } else { /* If no session name specified */
+ ret = LTTCOMM_SELECT_SESS;
+ }
+ goto error;
+ } else {
+ /* Acquire lock for the session */
+ lock_session(cmd_ctx->session);
+ }
+ break;
+ }
+
+ /*
+ * Check kernel command for kernel session.
+ */
+ switch (cmd_ctx->lsm->cmd_type) {
+ case LTTNG_KERNEL_ADD_CONTEXT:
+ case LTTNG_KERNEL_CREATE_CHANNEL:
+ case LTTNG_KERNEL_DISABLE_ALL_EVENT:
+ case LTTNG_KERNEL_DISABLE_CHANNEL:
+ case LTTNG_KERNEL_DISABLE_EVENT:
+ case LTTNG_KERNEL_ENABLE_ALL_EVENT:
+ case LTTNG_KERNEL_ENABLE_CHANNEL:
+ case LTTNG_KERNEL_ENABLE_EVENT:
+ case LTTNG_KERNEL_LIST_EVENTS:
+ /* Kernel tracer check */
+ if (kernel_tracer_fd == 0) {
+ init_kernel_tracer();
+ if (kernel_tracer_fd == 0) {
+ ret = LTTCOMM_KERN_NA;
+ goto error;
+ }
+ }
+
+ /* Need a session for kernel command */
+ if (cmd_ctx->lsm->cmd_type != LTTNG_KERNEL_LIST_EVENTS &&
+ cmd_ctx->session->kernel_session == NULL) {
+
+ ret = create_kernel_session(cmd_ctx->session);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_SESS_FAIL;
+ goto error;
+ }
+
+ /* Start the kernel consumer daemon */
+ if (kconsumerd_pid == 0) {
+ ret = start_kconsumerd();
+ if (ret < 0) {
+ goto error;
+ }
+ }
+ }
+ }
+
+ /* Connect to ust apps if available pid */
+ if (cmd_ctx->lsm->pid > 0) {
+ /* Connect to app using ustctl API */
+ cmd_ctx->ust_sock = ust_connect_app(cmd_ctx->lsm->pid);
+ if (cmd_ctx->ust_sock < 0) {
+ ret = LTTCOMM_NO_TRACEABLE;
+ goto error;
+ }
+ }
+
+ /* Process by command type */
+ switch (cmd_ctx->lsm->cmd_type) {
+ case LTTNG_KERNEL_ADD_CONTEXT:
+ {
+ int found = 0, no_event = 0;
+ struct ltt_kernel_channel *chan;
+ struct ltt_kernel_event *event;
+
+ /* Setup lttng message with no payload */
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
+ }
+
+ /* Check if event name is given */
+ if (strlen(cmd_ctx->lsm->u.context.event_name) == 0) {
+ no_event = 1;
+ }
+
+ if (strlen(cmd_ctx->lsm->u.context.channel_name) == 0) {
+ /* Go over all channels */
+ DBG("Adding context to all channels");
+ cds_list_for_each_entry(chan,
+ &cmd_ctx->session->kernel_session->channel_list.head, list) {
+ if (no_event) {
+ ret = kernel_add_channel_context(chan,
+ &cmd_ctx->lsm->u.context.ctx);
+ if (ret < 0) {
+ continue;
+ }
+ } else {
+ event = get_kernel_event_by_name(cmd_ctx->lsm->u.context.event_name, chan);
+ if (event != NULL) {
+ ret = kernel_add_event_context(event,
+ &cmd_ctx->lsm->u.context.ctx);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_CONTEXT_FAIL;
+ goto error;
+ }
+ found = 1;
+ break;
+ }
+ }
+ }
+ } else {
+ chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.context.channel_name,
+ cmd_ctx->session->kernel_session);
+ if (chan == NULL) {
+ ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
+ goto error;
+ }
+
+ if (no_event) {
+ ret = kernel_add_channel_context(chan,
+ &cmd_ctx->lsm->u.context.ctx);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_CONTEXT_FAIL;
+ goto error;
+ }
+ } else {
+ event = get_kernel_event_by_name(cmd_ctx->lsm->u.context.event_name, chan);
+ if (event != NULL) {
+ ret = kernel_add_event_context(event,
+ &cmd_ctx->lsm->u.context.ctx);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_CONTEXT_FAIL;
+ goto error;
+ }
+ }
+ }
+ }
- /* Check command that needs a session */
- switch (cmd_ctx->lsm->cmd_type) {
- case LTTNG_CREATE_SESSION:
- case LTTNG_LIST_SESSIONS:
- case KERNEL_LIST_EVENTS:
- case UST_LIST_APPS:
- break;
- default:
- cmd_ctx->session = find_session_by_uuid(cmd_ctx->lsm->session_uuid);
- if (cmd_ctx->session == NULL) {
- ret = LTTCOMM_SELECT_SESS;
+ if (!found && !no_event) {
+ ret = LTTCOMM_NO_EVENT;
goto error;
}
+
+ ret = LTTCOMM_OK;
break;
}
+ case LTTNG_KERNEL_CREATE_CHANNEL:
+ {
+ /* Setup lttng message with no payload */
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
+ }
- /* Check command for kernel tracing */
- switch (cmd_ctx->lsm->cmd_type) {
- case KERNEL_CREATE_SESSION:
- case KERNEL_CREATE_CHANNEL:
- case KERNEL_CREATE_STREAM:
- case KERNEL_DISABLE_EVENT:
- case KERNEL_ENABLE_EVENT:
- case KERNEL_LIST_EVENTS:
- case KERNEL_OPEN_METADATA:
- case KERNEL_START_TRACE:
- case KERNEL_STOP_TRACE:
- /* TODO: reconnect to kernel tracer to check if
- * it's loadded */
- if (kernel_tracer_fd == 0) {
- ret = LTTCOMM_KERN_NA;
+ /* Kernel tracer */
+ DBG("Creating kernel channel");
+
+ ret = kernel_create_channel(cmd_ctx->session->kernel_session,
+ &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_CHAN_FAIL;
goto error;
}
- break;
- }
- /* Connect to ust apps if available pid */
- if (cmd_ctx->lsm->pid > 0) {
- /* Connect to app using ustctl API */
- cmd_ctx->ust_sock = ust_connect_app(cmd_ctx->lsm->pid);
- if (cmd_ctx->ust_sock < 0) {
- ret = LTTCOMM_NO_TRACEABLE;
+ ret = notify_kernel_pollfd();
+ if (ret < 0) {
+ ret = LTTCOMM_FATAL;
goto error;
}
- }
- /* Process by command type */
- switch (cmd_ctx->lsm->cmd_type) {
- case KERNEL_CREATE_SESSION:
+ ret = LTTCOMM_OK;
+ break;
+ }
+ case LTTNG_KERNEL_DISABLE_CHANNEL:
{
+ struct ltt_kernel_channel *chan;
+
+ /* Setup lttng message with no payload */
ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
goto setup_error;
}
- ret = start_kconsumerd();
- if (ret < 0) {
+ chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
+ cmd_ctx->session->kernel_session);
+ if (chan == NULL) {
+ ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
goto error;
+ } else if (chan->enabled == 1) {
+ ret = kernel_disable_channel(chan);
+ if (ret < 0) {
+ if (ret != EEXIST) {
+ ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL;
+ }
+ goto error;
+ }
}
- DBG("Creating kernel session");
+ kernel_wait_quiescent(kernel_tracer_fd);
+ ret = LTTCOMM_OK;
+ break;
+ }
+ case LTTNG_KERNEL_DISABLE_EVENT:
+ {
+ struct ltt_kernel_channel *chan;
+ struct ltt_kernel_event *ev;
- ret = kernel_create_session(cmd_ctx->session, kernel_tracer_fd);
+ /* Setup lttng message with no payload */
+ ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
- ret = LTTCOMM_KERN_SESS_FAIL;
+ goto setup_error;
+ }
+
+ chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
+ cmd_ctx->session->kernel_session);
+ if (chan == NULL) {
+ ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
goto error;
}
+ ev = get_kernel_event_by_name(cmd_ctx->lsm->u.disable.name, chan);
+ if (ev != NULL) {
+ DBG("Disabling kernel event %s for channel %s.",
+ cmd_ctx->lsm->u.disable.name, cmd_ctx->lsm->u.disable.channel_name);
+ ret = kernel_disable_event(ev);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_ENABLE_FAIL;
+ goto error;
+ }
+ }
+
+ kernel_wait_quiescent(kernel_tracer_fd);
ret = LTTCOMM_OK;
break;
}
- case KERNEL_CREATE_CHANNEL:
+ case LTTNG_KERNEL_DISABLE_ALL_EVENT:
{
+ struct ltt_kernel_channel *chan;
+ struct ltt_kernel_event *ev;
+
+ /* Setup lttng message with no payload */
ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
goto setup_error;
}
- DBG("Creating kernel channel");
+ DBG("Disabling all enabled kernel events");
+
+ chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
+ cmd_ctx->session->kernel_session);
+ if (chan == NULL) {
+ ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
+ goto error;
+ }
+
+ /* For each event in the kernel session */
+ cds_list_for_each_entry(ev, &chan->events_list.head, list) {
+ DBG("Disabling kernel event %s for channel %s.",
+ ev->event->name, cmd_ctx->lsm->u.disable.channel_name);
+ ret = kernel_disable_event(ev);
+ if (ret < 0) {
+ continue;
+ }
+ }
- ret = kernel_create_channel(cmd_ctx->session->kernel_session);
+ /* Quiescent wait after event disable */
+ kernel_wait_quiescent(kernel_tracer_fd);
+ ret = LTTCOMM_OK;
+ break;
+ }
+ case LTTNG_KERNEL_ENABLE_CHANNEL:
+ {
+ struct ltt_kernel_channel *chan;
+ /* Setup lttng message with no payload */
+ ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
- ret = LTTCOMM_KERN_CHAN_FAIL;
+ goto setup_error;
+ }
+
+ chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name,
+ cmd_ctx->session->kernel_session);
+ if (chan == NULL) {
+ ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
goto error;
+ } else if (chan->enabled == 0) {
+ ret = kernel_enable_channel(chan);
+ if (ret < 0) {
+ if (ret != EEXIST) {
+ ret = LTTCOMM_KERN_CHAN_ENABLE_FAIL;
+ }
+ goto error;
+ }
}
+ kernel_wait_quiescent(kernel_tracer_fd);
ret = LTTCOMM_OK;
break;
}
- case KERNEL_ENABLE_EVENT:
+ case LTTNG_KERNEL_ENABLE_EVENT:
{
+ struct ltt_kernel_channel *chan;
+ struct ltt_kernel_event *ev;
+
/* Setup lttng message with no payload */
ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
goto setup_error;
}
- DBG("Enabling kernel event %s", cmd_ctx->lsm->u.event.event_name);
+ chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name,
+ cmd_ctx->session->kernel_session);
+ if (chan == NULL) {
+ ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
+ goto error;
+ }
+
+ ev = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, chan);
+ if (ev == NULL) {
+ DBG("Creating kernel event %s for channel %s.",
+ cmd_ctx->lsm->u.enable.event.name, chan->channel->name);
+ ret = kernel_create_event(&cmd_ctx->lsm->u.enable.event, chan);
+ } else {
+ DBG("Enabling kernel event %s for channel %s.",
+ cmd_ctx->lsm->u.enable.event.name, chan->channel->name);
+ ret = kernel_enable_event(ev);
+ }
- ret = kernel_enable_event(cmd_ctx->session->kernel_session, cmd_ctx->lsm->u.event.event_name);
if (ret < 0) {
ret = LTTCOMM_KERN_ENABLE_FAIL;
goto error;
}
+ kernel_wait_quiescent(kernel_tracer_fd);
ret = LTTCOMM_OK;
break;
}
- case KERNEL_ENABLE_ALL_EVENT:
+ case LTTNG_KERNEL_ENABLE_ALL_EVENT:
{
int pos, size;
char *event_list, *event, *ptr;
+ struct ltt_kernel_channel *chan;
+ struct ltt_kernel_event *ev;
+ struct lttng_event ev_attr;
/* Setup lttng message with no payload */
ret = setup_lttng_msg(cmd_ctx, 0);
DBG("Enabling all kernel event");
+ chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name,
+ cmd_ctx->session->kernel_session);
+ if (chan == NULL) {
+ ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
+ goto error;
+ }
+
+ /* For each event in the kernel session */
+ cds_list_for_each_entry(ev, &chan->events_list.head, list) {
+ DBG("Enabling kernel event %s for channel %s.",
+ ev->event->name, chan->channel->name);
+ ret = kernel_enable_event(ev);
+ if (ret < 0) {
+ continue;
+ }
+ }
+
size = kernel_list_events(kernel_tracer_fd, &event_list);
if (size < 0) {
ret = LTTCOMM_KERN_LIST_FAIL;
ptr = event_list;
while ((size = sscanf(ptr, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) {
- /* Enable each single event */
- ret = kernel_enable_event(cmd_ctx->session->kernel_session, event);
- if (ret < 0) {
- ret = LTTCOMM_KERN_ENABLE_FAIL;
- goto error;
+ ev = get_kernel_event_by_name(event, chan);
+ if (ev == NULL) {
+ strncpy(ev_attr.name, event, LTTNG_SYM_NAME_LEN);
+ /* Default event type for enable all */
+ ev_attr.type = LTTNG_EVENT_TRACEPOINTS;
+ /* Enable each single tracepoint event */
+ ret = kernel_create_event(&ev_attr, chan);
+ if (ret < 0) {
+ /* Ignore error here and continue */
+ }
}
+
/* Move pointer to the next line */
ptr += pos + 1;
free(event);
free(event_list);
+ /* Quiescent wait after event enable */
+ kernel_wait_quiescent(kernel_tracer_fd);
ret = LTTCOMM_OK;
break;
}
- case KERNEL_LIST_EVENTS:
+ case LTTNG_KERNEL_LIST_EVENTS:
{
char *event_list;
- ssize_t size;
+ ssize_t size = 0;
+
+ DBG("Listing kernel events");
size = kernel_list_events(kernel_tracer_fd, &event_list);
if (size < 0) {
ret = LTTCOMM_OK;
break;
}
- case KERNEL_OPEN_METADATA:
- {
- /* Setup lttng message with no payload */
- ret = setup_lttng_msg(cmd_ctx, 0);
- if (ret < 0) {
- goto setup_error;
- }
-
- DBG("Open kernel metadata");
-
- ret = kernel_open_metadata(cmd_ctx->session->kernel_session);
- if (ret < 0) {
- ret = LTTCOMM_KERN_META_FAIL;
- goto error;
- }
-
- ret = LTTCOMM_OK;
- break;
- }
- case KERNEL_CREATE_STREAM:
+ case LTTNG_START_TRACE:
{
struct ltt_kernel_channel *chan;
+
/* Setup lttng message with no payload */
ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
goto setup_error;
}
- DBG("Creating kernel stream");
+ /* Kernel tracing */
+ if (cmd_ctx->session->kernel_session != NULL) {
+ if (cmd_ctx->session->kernel_session->metadata == NULL) {
+ DBG("Open kernel metadata");
+ ret = kernel_open_metadata(cmd_ctx->session->kernel_session,
+ cmd_ctx->session->path);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_META_FAIL;
+ goto error;
+ }
+ }
- ret = kernel_create_metadata_stream(cmd_ctx->session->kernel_session);
- if (ret < 0) {
- ERR("Kernel create metadata stream failed");
- ret = LTTCOMM_KERN_STREAM_FAIL;
- goto error;
- }
+ if (cmd_ctx->session->kernel_session->metadata_stream_fd == 0) {
+ DBG("Opening kernel metadata stream");
+ if (cmd_ctx->session->kernel_session->metadata_stream_fd == 0) {
+ ret = kernel_open_metadata_stream(cmd_ctx->session->kernel_session);
+ if (ret < 0) {
+ ERR("Kernel create metadata stream failed");
+ ret = LTTCOMM_KERN_STREAM_FAIL;
+ goto error;
+ }
+ }
+ }
+
+ /* For each channel */
+ cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) {
+ if (chan->stream_count == 0) {
+ ret = kernel_open_channel_stream(chan);
+ if (ret < 0) {
+ ERR("Kernel create channel stream failed");
+ ret = LTTCOMM_KERN_STREAM_FAIL;
+ goto error;
+ }
+ /* Update the stream global counter */
+ cmd_ctx->session->kernel_session->stream_count_global += ret;
+ }
+ }
- /* For each channel */
- cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) {
- ret = kernel_create_channel_stream(chan);
+ DBG("Start kernel tracing");
+ ret = kernel_start_session(cmd_ctx->session->kernel_session);
if (ret < 0) {
- ERR("Kernel create channel stream failed");
- ret = LTTCOMM_KERN_STREAM_FAIL;
+ ERR("Kernel start session failed");
+ ret = LTTCOMM_KERN_START_FAIL;
goto error;
}
- /* Update the stream global counter */
- cmd_ctx->session->kernel_session->stream_count_global += ret;
- }
-
- ret = LTTCOMM_OK;
- break;
- }
- case KERNEL_START_TRACE:
- {
- /* Setup lttng message with no payload */
- ret = setup_lttng_msg(cmd_ctx, 0);
- if (ret < 0) {
- goto setup_error;
- }
-
- DBG("Start kernel tracing");
- ret = create_trace_dir(cmd_ctx->session->kernel_session);
- if (ret < 0) {
- if (ret == -EEXIST) {
- ret = LTTCOMM_KERN_DIR_EXIST;
- } else {
- ret = LTTCOMM_KERN_DIR_FAIL;
+ ret = start_kernel_trace(cmd_ctx->session->kernel_session);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_START_FAIL;
goto error;
}
- }
- ret = kernel_start_session(cmd_ctx->session->kernel_session);
- if (ret < 0) {
- ERR("Kernel start session failed");
- ret = LTTCOMM_KERN_START_FAIL;
- goto error;
+ /* Quiescent wait after starting trace */
+ kernel_wait_quiescent(kernel_tracer_fd);
}
- ret = send_kconsumerd_fds(kconsumerd_cmd_sock, cmd_ctx->session->kernel_session);
- if (ret < 0) {
- ERR("Send kconsumerd fds failed");
- ret = LTTCOMM_KERN_CONSUMER_FAIL;
- goto error;
- }
+ /* TODO: Start all UST traces */
ret = LTTCOMM_OK;
break;
}
- case KERNEL_STOP_TRACE:
+ case LTTNG_STOP_TRACE:
{
+ struct ltt_kernel_channel *chan;
/* Setup lttng message with no payload */
ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
goto setup_error;
}
- if (cmd_ctx->session->kernel_session == NULL) {
- ret = LTTCOMM_KERN_NO_SESSION;
- goto error;
- }
+ /* Kernel tracer */
+ if (cmd_ctx->session->kernel_session != NULL) {
+ DBG("Stop kernel tracing");
+
+ ret = kernel_metadata_flush_buffer(cmd_ctx->session->kernel_session->metadata_stream_fd);
+ if (ret < 0) {
+ ERR("Kernel metadata flush failed");
+ }
- DBG("Stop kernel tracing");
+ cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) {
+ ret = kernel_flush_buffer(chan);
+ if (ret < 0) {
+ ERR("Kernel flush buffer error");
+ }
+ }
- ret = kernel_stop_session(cmd_ctx->session->kernel_session);
- if (ret < 0) {
- ERR("Kernel stop session failed");
- ret = LTTCOMM_KERN_STOP_FAIL;
- goto error;
+ ret = kernel_stop_session(cmd_ctx->session->kernel_session);
+ if (ret < 0) {
+ ERR("Kernel stop session failed");
+ ret = LTTCOMM_KERN_STOP_FAIL;
+ goto error;
+ }
+
+ /* Quiescent wait after stopping trace */
+ kernel_wait_quiescent(kernel_tracer_fd);
}
- /* Clean kernel session teardown */
- teardown_kernel_session(cmd_ctx->session);
+ /* TODO : User-space tracer */
ret = LTTCOMM_OK;
break;
goto setup_error;
}
- ret = create_session(cmd_ctx->lsm->session_name, &cmd_ctx->llm->session_uuid);
+ ret = create_session(cmd_ctx->lsm->session_name, cmd_ctx->lsm->path);
if (ret < 0) {
- if (ret == -1) {
+ if (ret == -EEXIST) {
ret = LTTCOMM_EXIST_SESS;
} else {
ret = LTTCOMM_FATAL;
goto setup_error;
}
- ret = destroy_session(&cmd_ctx->lsm->session_uuid);
+ /* Clean kernel session teardown */
+ teardown_kernel_session(cmd_ctx->session);
+
+ ret = destroy_session(cmd_ctx->lsm->session_name);
+ if (ret < 0) {
+ ret = LTTCOMM_FATAL;
+ goto error;
+ }
+
+ /*
+ * Must notify the kernel thread here to update it's pollfd in order to
+ * remove the channel(s)' fd just destroyed.
+ */
+ ret = notify_kernel_pollfd();
if (ret < 0) {
- ret = LTTCOMM_NO_SESS;
+ ret = LTTCOMM_FATAL;
goto error;
}
ret = LTTCOMM_OK;
break;
}
+ /*
case LTTNG_LIST_TRACES:
{
unsigned int trace_count;
ret = LTTCOMM_OK;
break;
}
+ */
+ /*
case UST_CREATE_TRACE:
{
- /* Setup lttng message with no payload */
ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
goto setup_error;
ret = ust_create_trace(cmd_ctx);
if (ret < 0) {
- goto setup_error;
+ goto error;
}
break;
}
- case UST_LIST_APPS:
+ */
+ case LTTNG_LIST_TRACEABLE_APPS:
{
unsigned int app_count;
ret = LTTCOMM_OK;
break;
}
+ /*
case UST_START_TRACE:
{
- /* Setup lttng message with no payload */
ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
goto setup_error;
}
case UST_STOP_TRACE:
{
- /* Setup lttng message with no payload */
ret = setup_lttng_msg(cmd_ctx, 0);
if (ret < 0) {
goto setup_error;
}
break;
}
+ */
case LTTNG_LIST_SESSIONS:
{
unsigned int session_count;
session_count = get_session_count();
if (session_count == 0) {
- ret = LTTCOMM_NO_SESS;
+ ret = LTTCOMM_NO_SESSION;
goto error;
}
/* Set return code */
cmd_ctx->llm->ret_code = ret;
+ if (cmd_ctx->session) {
+ unlock_session(cmd_ctx->session);
+ }
+
return ret;
error:
cmd_ctx->llm->ret_code = ret;
setup_error:
+ if (cmd_ctx->session) {
+ unlock_session(cmd_ctx->session);
+ }
return ret;
}
continue;
}
+ // TODO: Validate cmd_ctx including sanity check for security purpose.
+
/*
* This function dispatch the work to the kernel or userspace tracer
* libs and fill the lttcomm_lttng_msg data structure of all the needed
return ret;
}
-/*
- * get_home_dir
- *
- * Return pointer to home directory path using
- * the env variable HOME.
- *
- * Default : /tmp
- */
-static const char *get_home_dir(void)
-{
- const char *home_path;
-
- if ((home_path = (const char *) getenv("HOME")) == NULL) {
- home_path = default_home_dir;
- }
-
- return home_path;
-}
-
/*
* set_permissions
*
* Set the tracing group gid onto the client socket.
*
* Race window between mkdir and chown is OK because we are going from
- * less permissive (root.root) to more permissive (root.tracing).
+ * more permissive (root.root) to les permissive (root.tracing).
*/
static int set_permissions(void)
{
(grp = getgrnam(default_tracing_group));
if (grp == NULL) {
- ERR("Missing tracing group. Aborting execution.\n");
- ret = -1;
+ if (is_root) {
+ WARN("No tracing group detected");
+ ret = 0;
+ } else {
+ ERR("Missing tracing group. Aborting execution.");
+ ret = -1;
+ }
goto end;
}
return ret;
}
+/*
+ * create_kernel_poll_pipe
+ *
+ * Create the pipe used to wake up the kernel thread.
+ */
+static int create_kernel_poll_pipe(void)
+{
+ return pipe2(kernel_poll_pipe, O_CLOEXEC);
+}
+
/*
* create_lttng_rundir
*
return ret;
}
-/*
- * init_kernel_tracer
- *
- * Setup necessary data for kernel tracer action.
- */
-static void init_kernel_tracer(void)
-{
- /* Set the global kernel tracer fd */
- kernel_tracer_fd = open(DEFAULT_KERNEL_TRACER_PATH, O_RDWR);
- if (kernel_tracer_fd < 0) {
- WARN("No kernel tracer available");
- kernel_tracer_fd = 0;
- }
-
- DBG("Kernel tracer fd %d", kernel_tracer_fd);
-}
-
/*
* set_kconsumerd_sockets
*
ret = mkdir(KCONSUMERD_PATH, S_IRWXU | S_IRWXG);
if (ret < 0) {
- ERR("Failed to create " KCONSUMERD_PATH);
- goto error;
+ if (errno != EEXIST) {
+ ERR("Failed to create " KCONSUMERD_PATH);
+ goto error;
+ }
+ ret = 0;
}
/* Create the kconsumerd error unix socket */
return ret;
}
+/*
+ * set_ulimit
+ *
+ * Set open files limit to unlimited. This daemon can open a large number of
+ * file descriptors in order to consumer multiple kernel traces.
+ */
+static void set_ulimit(void)
+{
+ int ret;
+ struct rlimit lim;
+
+ lim.rlim_cur = 65535;
+ lim.rlim_max = 65535;
+
+ ret = setrlimit(RLIMIT_NOFILE, &lim);
+ if (ret < 0) {
+ perror("failed to set open files limit");
+ }
+}
+
/*
* main
*/
{
int ret = 0;
void *status;
+ const char *home_path;
/* Parse arguments */
progname = argv[0];
/* Check if daemon is UID = 0 */
is_root = !getuid();
- /* Set all sockets path */
if (is_root) {
ret = create_lttng_rundir();
if (ret < 0) {
/* Setup kernel tracer */
init_kernel_tracer();
+
+ /* Set ulimit for open files */
+ set_ulimit();
} else {
+ home_path = get_home_dir();
+ if (home_path == NULL) {
+ ERR("Can't get HOME directory for sockets creation.\n \
+ Please specify --socket PATH.");
+ goto error;
+ }
+
if (strlen(apps_unix_sock_path) == 0) {
snprintf(apps_unix_sock_path, PATH_MAX,
- DEFAULT_HOME_APPS_UNIX_SOCK, get_home_dir());
+ DEFAULT_HOME_APPS_UNIX_SOCK, home_path);
}
/* 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, get_home_dir());
+ DEFAULT_HOME_CLIENT_UNIX_SOCK, home_path);
}
}
ppid = getppid();
}
+ /* Setup the kernel pipe for waking up the kernel thread */
+ if (create_kernel_poll_pipe() < 0) {
+ goto error;
+ }
+
+ /* Get session list pointer */
+ session_list_ptr = get_session_list();
+
while (1) {
/* Create thread to manage the client socket */
ret = pthread_create(&client_thread, NULL, thread_manage_clients, (void *) NULL);
goto error;
}
+ /* Create kernel thread to manage kernel event */
+ ret = pthread_create(&kernel_thread, NULL, thread_manage_kernel, (void *) NULL);
+ if (ret != 0) {
+ perror("pthread_create");
+ goto error;
+ }
+
ret = pthread_join(client_thread, &status);
if (ret != 0) {
perror("pthread_join");
projects / lttng-tools.git / blobdiff