#include <urcu/list.h> /* URCU list library (-lurcu) */
#include <ust/ustctl.h> /* UST control lib (-lust) */
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
#include "liblttsessiondcomm.h"
#include "ltt-sessiond.h"
#include "lttngerr.h"
+#include "kernel-ctl.h"
#include "session.h"
#include "trace.h"
#include "traceable-app.h"
+/*
+ * TODO:
+ * teardown: signal SIGTERM handler -> write into pipe. Threads waits
+ * with epoll on pipe and on other pipes/sockets for commands. Main
+ * simply waits on pthread join.
+ */
+
/* Const values */
const char default_home_dir[] = DEFAULT_HOME_DIR;
const char default_tracing_group[] = DEFAULT_TRACING_GROUP;
/* Static functions */
static int check_existing_daemon(void);
-static int connect_app(pid_t pid);
+static int ust_connect_app(pid_t pid);
static int init_daemon_socket(void);
static int notify_apps(const char* name);
-static int process_client_msg(int sock, struct lttcomm_session_msg*);
+static int process_client_msg(struct command_ctx *cmd_ctx);
static int send_unix_sock(int sock, void *buf, size_t len);
static int set_signal_handler(void);
-static int set_socket_perms(void);
-static int setup_data_buffer(char **buf, size_t size, struct lttcomm_lttng_msg *llm);
+static int set_permissions(void);
+static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size);
+static int create_lttng_rundir(void);
+static int set_kconsumerd_sockets(void);
static void cleanup(void);
-static void copy_common_data(struct lttcomm_lttng_msg *llm, struct lttcomm_session_msg *lsm);
static void sighandler(int sig);
+static void clean_command_ctx(struct command_ctx *cmd_ctx);
static void *thread_manage_clients(void *data);
static void *thread_manage_apps(void *data);
+static void *thread_manage_kconsumerd(void *data);
/* Variables */
int opt_verbose;
static int is_root; /* Set to 1 if the daemon is running as root */
static pid_t ppid;
-static char apps_unix_sock_path[PATH_MAX]; /* Global application Unix socket path */
-static char client_unix_sock_path[PATH_MAX]; /* Global client Unix socket path */
+static char apps_unix_sock_path[PATH_MAX]; /* Global application Unix socket path */
+static char client_unix_sock_path[PATH_MAX]; /* Global client Unix socket path */
+static char kconsumerd_err_unix_sock_path[PATH_MAX]; /* kconsumerd error Unix socket path */
+static char kconsumerd_cmd_unix_sock_path[PATH_MAX]; /* kconsumerd command Unix socket path */
+
+static int client_sock;
+static int apps_sock;
+static int kconsumerd_err_sock;
+static int kernel_tracer_fd;
+
+/*
+ * thread_manage_kconsumerd
+ *
+ * This thread manage the kconsumerd error sent
+ * back to the session daemon.
+ */
+static void *thread_manage_kconsumerd(void *data)
+{
+ int sock, ret;
+
+ DBG("[thread] Manage kconsumerd started");
+
+ ret = lttcomm_listen_unix_sock(kconsumerd_err_sock);
+ if (ret < 0) {
+ goto error;
+ }
+
+ sock = lttcomm_accept_unix_sock(kconsumerd_err_sock);
+ if (sock < 0) {
+ goto error;
+ }
-static int client_socket;
-static int apps_socket;
+ while (1) {
+ //ret = lttcomm_recv_unix_sock(sock, &lsm, sizeof(lsm));
+ if (ret <= 0) {
+ /* TODO: Consumerd died? */
+ continue;
+ }
+ }
-static struct ltt_session *current_session;
+error:
+ return NULL;
+}
/*
* thread_manage_apps
int sock, ret;
/* TODO: Something more elegant is needed but fine for now */
+ /* FIXME: change all types to either uint8_t, uint32_t, uint64_t
+ * for 32-bit vs 64-bit compat processes. */
+ /* replicate in ust with version number */
struct {
int reg; /* 1:register, 0:unregister */
pid_t pid;
uid_t uid;
} reg_msg;
- /* Notify all applications to register */
- notify_apps(default_global_apps_pipe);
+ DBG("[thread] Manage apps started");
- ret = lttcomm_listen_unix_sock(apps_socket);
+ ret = lttcomm_listen_unix_sock(apps_sock);
if (ret < 0) {
goto error;
}
+ /* Notify all applications to register */
+ notify_apps(default_global_apps_pipe);
+
while (1) {
+ DBG("Accepting application registration");
/* Blocking call, waiting for transmission */
- sock = lttcomm_accept_unix_sock(apps_socket);
+ sock = lttcomm_accept_unix_sock(apps_sock);
if (sock < 0) {
goto error;
}
static void *thread_manage_clients(void *data)
{
int sock, ret;
- struct lttcomm_session_msg lsm;
+ struct command_ctx *cmd_ctx;
+
+ DBG("[thread] Manage client started");
- ret = lttcomm_listen_unix_sock(client_socket);
+ ret = lttcomm_listen_unix_sock(client_sock);
if (ret < 0) {
goto error;
}
while (1) {
/* Blocking call, waiting for transmission */
- sock = lttcomm_accept_unix_sock(client_socket);
+ DBG("Accepting client command ...");
+ sock = lttcomm_accept_unix_sock(client_sock);
if (sock < 0) {
goto error;
}
+ /* Allocate context command to process the client request */
+ cmd_ctx = malloc(sizeof(struct command_ctx));
+
+ /* Allocate data buffer for reception */
+ cmd_ctx->lsm = malloc(sizeof(struct lttcomm_session_msg));
+ cmd_ctx->llm = NULL;
+ cmd_ctx->session = NULL;
+
/*
* Data is received from the lttng client. The struct
- * lttcomm_session_msg (lsm) contains the command and data
- * request of the client.
+ * lttcomm_session_msg (lsm) contains the command and data request of
+ * the client.
*/
- ret = lttcomm_recv_unix_sock(sock, &lsm, sizeof(lsm));
+ DBG("Receiving data from client ...");
+ ret = lttcomm_recv_unix_sock(sock, cmd_ctx->lsm, sizeof(struct lttcomm_session_msg));
if (ret <= 0) {
continue;
}
- /* This function dispatch the work to the LTTng or UST libs
- * and then sends back the response to the client. This is needed
- * because there might be more then one lttcomm_lttng_msg to
- * send out so process_client_msg do both jobs.
+ /*
+ * This function dispatch the work to the kernel or userspace tracer
+ * libs and fill the lttcomm_lttng_msg data structure of all the needed
+ * informations for the client. The command context struct contains
+ * everything this function may needs.
*/
- ret = process_client_msg(sock, &lsm);
+ ret = process_client_msg(cmd_ctx);
if (ret < 0) {
+ /* TODO: Inform client somehow of the fatal error. At this point,
+ * ret < 0 means that a malloc failed (ENOMEM). */
/* Error detected but still accept command */
+ clean_command_ctx(cmd_ctx);
continue;
}
+
+ DBG("Sending response (size: %d, retcode: %d)",
+ cmd_ctx->lttng_msg_size, cmd_ctx->llm->ret_code);
+ ret = send_unix_sock(sock, cmd_ctx->llm, cmd_ctx->lttng_msg_size);
+ if (ret < 0) {
+ ERR("Failed to send data back to client");
+ }
+
+ clean_command_ctx(cmd_ctx);
}
error:
}
/*
- * connect_app
+ * clean_command_ctx
+ *
+ * Free memory of a command context structure.
+ */
+static void clean_command_ctx(struct command_ctx *cmd_ctx)
+{
+ DBG("Clean command context structure %p", cmd_ctx);
+ if (cmd_ctx) {
+ if (cmd_ctx->llm) {
+ free(cmd_ctx->llm);
+ }
+ if (cmd_ctx->lsm) {
+ free(cmd_ctx->lsm);
+ }
+ free(cmd_ctx);
+ cmd_ctx = NULL;
+ }
+}
+
+/*
+ * ust_connect_app
*
* Return a socket connected to the libust communication socket
* of the application identified by the pid.
* If the pid is not found in the traceable list,
* return -1 to indicate error.
*/
-static int connect_app(pid_t pid)
+static int ust_connect_app(pid_t pid)
{
int sock;
struct ltt_traceable_app *lta;
+ DBG("Connect to application pid %d", pid);
+
lta = find_app_by_pid(pid);
if (lta == NULL) {
/* App not found */
+ DBG("Application pid %d not found", pid);
return -1;
}
int fd;
int ret = -1;
+ DBG("Notify the global application pipe");
+
/* Try opening the global pipe */
fd = open(name, O_WRONLY);
if (fd < 0) {
}
/*
- * ust_create_trace
+ * setup_lttng_msg
+ *
+ * Setup the outgoing data buffer for the response (llm) by allocating the
+ * right amount of memory and copying the original information from the lsm
+ * structure.
*
- * Create an userspace trace using pid.
- * This trace is then appended to the current session
- * ust trace list.
+ * Return total size of the buffer pointed by buf.
*/
-static int ust_create_trace(pid_t pid)
+static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size)
{
- int sock, ret;
- struct ltt_ust_trace *trace;
+ int ret, buf_size, trace_name_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;
- trace = malloc(sizeof(struct ltt_ust_trace));
- if (trace == NULL) {
+ cmd_ctx->llm = malloc(sizeof(struct lttcomm_lttng_msg) + buf_size);
+ if (cmd_ctx->llm == NULL) {
perror("malloc");
- ret = -1;
+ ret = -ENOMEM;
goto error;
}
- /* Init */
- trace->pid = pid;
- trace->shmid = 0;
-
- /* Connect to app using ustctl API */
- sock = connect_app(pid);
- if (sock < 0) {
- ret = LTTCOMM_NO_TRACEABLE;
- goto error;
+ /* 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);
}
- ret = ustctl_create_trace(sock, "auto");
- if (ret < 0) {
- ret = LTTCOMM_CREATE_FAIL;
- goto error;
- }
+ 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;
- /* Check if current session is valid */
- if (current_session) {
- cds_list_add(&trace->list, ¤t_session->ust_traces);
- }
+ /* 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;
}
/*
- * ust_start_trace
+ * process_client_msg
+ *
+ * Process the command requested by the lttng client within the command
+ * context structure. This function make sure that the return structure (llm)
+ * is set and ready for transmission before returning.
*
- * Start a trace. This trace, identified by the pid, must be
- * in the current session ust_traces list.
+ * Return any error encountered or 0 for success.
*/
-static int ust_start_trace(pid_t pid)
+static int process_client_msg(struct command_ctx *cmd_ctx)
{
- int sock, ret;
- struct ltt_ust_trace *trace;
+ int ret;
- DBG("Starting trace for pid %d", pid);
+ DBG("Processing client command %d", cmd_ctx->lsm->cmd_type);
- trace = find_session_ust_trace_by_pid(current_session, pid);
- if (trace == NULL) {
- ret = LTTCOMM_NO_TRACE;
- goto error;
+ /* Check command that needs a session */
+ switch (cmd_ctx->lsm->cmd_type) {
+ case LTTNG_CREATE_SESSION:
+ case LTTNG_LIST_SESSIONS:
+ 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;
+ goto error;
+ }
+ break;
}
- /* Connect to app using ustctl API */
- sock = connect_app(pid);
- if (sock < 0) {
- ret = LTTCOMM_NO_TRACEABLE;
- goto error;
+ /* Check command for kernel tracing */
+ switch (cmd_ctx->lsm->cmd_type) {
+ case KERNEL_CREATE_SESSION:
+ case KERNEL_CREATE_CHANNEL:
+ case KERNEL_DISABLE_EVENT:
+ case KERNEL_ENABLE_EVENT:
+ 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;
+ goto error;
+ }
+ break;
}
- ret = ustctl_start_trace(sock, "auto");
- if (ret < 0) {
- ret = LTTCOMM_START_FAIL;
- goto error;
+ /* Connect to ust apps if available pid */
+ if (cmd_ctx->lsm->pid > 0) {
+ /* Connect to app using ustctl API */
+ cmd_ctx->ust_sock = ust_connect_app(cmd_ctx->lsm->pid);
+ if (cmd_ctx->ust_sock < 0) {
+ ret = LTTCOMM_NO_TRACEABLE;
+ goto error;
+ }
}
-error:
- return ret;
-}
-
-/*
- * copy_common_data
- *
- * Copy common data between lttcomm_lttng_msg and lttcomm_session_msg
- */
-static void copy_common_data(struct lttcomm_lttng_msg *llm, struct lttcomm_session_msg *lsm)
-{
- llm->cmd_type = lsm->cmd_type;
- llm->pid = lsm->pid;
-
- /* Manage uuid */
- if (!uuid_is_null(lsm->session_id)) {
- uuid_copy(llm->session_id, lsm->session_id);
- }
+ /* Process by command type */
+ switch (cmd_ctx->lsm->cmd_type) {
+ case KERNEL_CREATE_SESSION:
+ {
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
+ }
- strncpy(llm->trace_name, lsm->trace_name, strlen(llm->trace_name));
- llm->trace_name[strlen(llm->trace_name) - 1] = '\0';
-}
+ DBG("Creating kernel session");
-/*
- * setup_data_buffer
- *
- * Setup the outgoing data buffer for the response
- * data allocating the right amount of memory.
- *
- * Return total size of the buffer pointed by buf.
- */
-static int setup_data_buffer(char **buf, size_t s_data, struct lttcomm_lttng_msg *llm)
-{
- int ret = 0;
- size_t buf_size;
+ ret = kernel_create_session(cmd_ctx, kernel_tracer_fd);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_SESS_FAIL;
+ goto error;
+ }
- buf_size = sizeof(struct lttcomm_lttng_msg) + s_data;
- *buf = malloc(buf_size);
- if (*buf == NULL) {
- perror("malloc");
- ret = -1;
- goto error;
+ ret = LTTCOMM_OK;
+ break;
}
+ case KERNEL_CREATE_CHANNEL:
+ {
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
+ }
- /* Setup lttcomm_lttng_msg data and copy
- * it to the newly allocated buffer.
- */
- llm->size_payload = s_data;
- memcpy(*buf, llm, sizeof(struct lttcomm_lttng_msg));
+ DBG("Creating kernel session");
- return buf_size;
+ ret = kernel_create_channel(cmd_ctx);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_CHAN_FAIL;
+ goto error;
+ }
-error:
- return ret;
-}
+ ret = LTTCOMM_OK;
+ break;
+ }
+ case KERNEL_ENABLE_EVENT:
+ {
+ /* Setup lttng message with no payload */
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
+ }
-/*
- * process_client_msg
- *
- * This takes the lttcomm_session_msg struct and process the command requested
- * by the client. It then creates response(s) and send it back to the
- * given socket (sock).
- *
- * Return any error encountered or 0 for success.
- */
-static int process_client_msg(int sock, struct lttcomm_session_msg *lsm)
-{
- int ret;
- int buf_size;
- size_t header_size;
- char *send_buf = NULL;
- struct lttcomm_lttng_msg llm;
+ DBG("Enabling kernel event %s", cmd_ctx->lsm->u.event.event_name);
- /* Copy common data to identify the response
- * on the lttng client side.
- */
- copy_common_data(&llm, lsm);
+ ret = kernel_enable_event(cmd_ctx->session->kernel_session->channel, cmd_ctx->lsm->u.event.event_name);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_ENABLE_FAIL;
+ goto error;
+ }
- /* Check command that needs a session */
- if (lsm->cmd_type != LTTNG_CREATE_SESSION &&
- lsm->cmd_type != LTTNG_LIST_SESSIONS &&
- lsm->cmd_type != UST_LIST_APPS)
+ ret = LTTCOMM_OK;
+ break;
+ }
+ case KERNEL_OPEN_METADATA:
{
- current_session = find_session_by_uuid(lsm->session_id);
- if (current_session == NULL) {
- ret = LTTCOMM_SELECT_SESS;
- goto end;
+ /* Setup lttng message with no payload */
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
}
- }
- /* Default return code.
- * In our world, everything is OK... right? ;)
- */
- llm.ret_code = LTTCOMM_OK;
+ DBG("Open kernel metadata");
- header_size = sizeof(struct lttcomm_lttng_msg);
+ ret = kernel_open_metadata(cmd_ctx->session->kernel_session);
+ if (ret < 0) {
+ ret = LTTCOMM_KERN_META_FAIL;
+ goto error;
+ }
- /* Process by command type */
- switch (lsm->cmd_type) {
- case LTTNG_CREATE_SESSION:
- {
- ret = create_session(lsm->session_name, &llm.session_id);
- if (ret < 0) {
- if (ret == -1) {
- ret = LTTCOMM_EXIST_SESS;
- } else {
- ret = LTTCOMM_FATAL;
- }
- goto end;
- }
+ ret = LTTCOMM_OK;
+ break;
+ }
+ case LTTNG_CREATE_SESSION:
+ {
+ /* Setup lttng message with no payload */
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
+ }
- buf_size = setup_data_buffer(&send_buf, 0, &llm);
- if (buf_size < 0) {
+ ret = create_session(cmd_ctx->lsm->session_name, &cmd_ctx->llm->session_uuid);
+ if (ret < 0) {
+ if (ret == -1) {
+ ret = LTTCOMM_EXIST_SESS;
+ } else {
ret = LTTCOMM_FATAL;
- goto end;
}
+ goto error;
+ }
- break;
+ ret = LTTCOMM_OK;
+ break;
+ }
+ case LTTNG_DESTROY_SESSION:
+ {
+ /* Setup lttng message with no payload */
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
}
- case LTTNG_DESTROY_SESSION:
- {
- ret = destroy_session(&lsm->session_id);
- if (ret < 0) {
- ret = LTTCOMM_NO_SESS;
- } else {
- ret = LTTCOMM_OK;
- }
- /* No auxiliary data so only send the llm struct. */
- goto end;
+ ret = destroy_session(&cmd_ctx->lsm->session_uuid);
+ if (ret < 0) {
+ ret = LTTCOMM_NO_SESS;
+ goto error;
}
- case UST_CREATE_TRACE:
- {
- ret = ust_create_trace(lsm->pid);
- if (ret < 0) {
- /* If -1 is returned from ust_create_trace, malloc
- * failed so it's pretty much a fatal error.
- */
- ret = LTTCOMM_FATAL;
- goto end;
- }
- /* No auxiliary data so only send the llm struct. */
- goto end;
+ ret = LTTCOMM_OK;
+ break;
+ }
+ case LTTNG_LIST_TRACES:
+ {
+ unsigned int trace_count;
+
+ trace_count = get_trace_count_per_session(cmd_ctx->session);
+ if (trace_count == 0) {
+ ret = LTTCOMM_NO_TRACE;
+ goto error;
}
- case UST_LIST_APPS:
- {
- unsigned int app_count = get_app_count();
- /* Stop right now if no apps */
- if (app_count == 0) {
- ret = LTTCOMM_NO_APPS;
- goto end;
- }
- /* Setup data buffer and details for transmission */
- buf_size = setup_data_buffer(&send_buf,
- sizeof(pid_t) * app_count, &llm);
- if (buf_size < 0) {
- ret = LTTCOMM_FATAL;
- goto end;
- }
+ ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_trace) * trace_count);
+ if (ret < 0) {
+ goto setup_error;
+ }
- get_app_list_pids((pid_t *)(send_buf + header_size));
+ get_traces_per_session(cmd_ctx->session,
+ (struct lttng_trace *)(cmd_ctx->llm->payload));
- break;
+ 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;
}
- case UST_START_TRACE:
- {
- ret = ust_start_trace(lsm->pid);
- /* No auxiliary data so only send the llm struct. */
- goto end;
+ ret = ust_create_trace(cmd_ctx);
+ if (ret < 0) {
+ goto setup_error;
}
- case LTTNG_LIST_SESSIONS:
- {
- unsigned int session_count = get_session_count();
- /* Stop right now if no session */
- if (session_count == 0) {
- ret = LTTCOMM_NO_SESS;
- goto end;
- }
+ break;
+ }
+ case UST_LIST_APPS:
+ {
+ unsigned int app_count;
- /* Setup data buffer and details for transmission */
- buf_size = setup_data_buffer(&send_buf,
- (sizeof(struct lttng_session) * session_count), &llm);
- if (buf_size < 0) {
- ret = LTTCOMM_FATAL;
- goto end;
- }
+ app_count = get_app_count();
+ DBG("Traceable application count : %d", app_count);
+ if (app_count == 0) {
+ ret = LTTCOMM_NO_APPS;
+ goto error;
+ }
- get_lttng_session((struct lttng_session *)(send_buf + header_size));
+ ret = setup_lttng_msg(cmd_ctx, sizeof(pid_t) * app_count);
+ if (ret < 0) {
+ goto setup_error;
+ }
- break;
+ get_app_list_pids((pid_t *)(cmd_ctx->llm->payload));
+
+ 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;
}
- default:
- {
- /* Undefined command */
- ret = LTTCOMM_UND;
- goto end;
+
+ ret = ust_start_trace(cmd_ctx);
+ if (ret < 0) {
+ goto setup_error;
+ }
+ break;
+ }
+ case UST_STOP_TRACE:
+ {
+ /* Setup lttng message with no payload */
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
+ }
+
+ ret = ust_stop_trace(cmd_ctx);
+ if (ret < 0) {
+ goto setup_error;
}
+ break;
}
+ case LTTNG_LIST_SESSIONS:
+ {
+ unsigned int session_count;
+
+ session_count = get_session_count();
+ if (session_count == 0) {
+ ret = LTTCOMM_NO_SESS;
+ goto error;
+ }
- ret = send_unix_sock(sock, send_buf, buf_size);
+ ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * session_count);
+ if (ret < 0) {
+ goto setup_error;
+ }
- if (send_buf != NULL) {
- free(send_buf);
+ get_lttng_session((struct lttng_session *)(cmd_ctx->llm->payload));
+
+ ret = LTTCOMM_OK;
+ break;
+ }
+ default:
+ /* Undefined command */
+ ret = setup_lttng_msg(cmd_ctx, 0);
+ if (ret < 0) {
+ goto setup_error;
+ }
+
+ ret = LTTCOMM_UND;
+ break;
}
+ /* Set return code */
+ cmd_ctx->llm->ret_code = ret;
+
return ret;
-end:
+error:
+ if (cmd_ctx->llm == NULL) {
+ DBG("Missing llm structure. Allocating one.");
+ if (setup_lttng_msg(cmd_ctx, 0) < 0) {
+ goto setup_error;
+ }
+ }
/* Notify client of error */
- llm.ret_code = ret;
- llm.size_payload = 0;
- send_unix_sock(sock, (void*) &llm, sizeof(llm));
+ cmd_ctx->llm->ret_code = ret;
+setup_error:
return ret;
}
static void usage(void)
{
fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname);
- fprintf(stderr, " -h, --help Display this usage.\n");
- fprintf(stderr, " -c, --client-sock PATH Specify path for the client unix socket\n");
- fprintf(stderr, " -a, --apps-sock PATH Specify path for apps unix socket.\n");
- fprintf(stderr, " -d, --daemonize Start as a daemon.\n");
- fprintf(stderr, " -g, --group NAME Specify the tracing group name. (default: tracing)\n");
- fprintf(stderr, " -V, --version Show version number.\n");
- fprintf(stderr, " -S, --sig-parent Send SIGCHLD to parent pid to notify readiness.\n");
- fprintf(stderr, " -q, --quiet No output at all.\n");
+ fprintf(stderr, " -h, --help Display this usage.\n");
+ fprintf(stderr, " -c, --client-sock PATH Specify path for the client unix socket\n");
+ fprintf(stderr, " -a, --apps-sock PATH Specify path for apps unix socket\n");
+ fprintf(stderr, " --kconsumerd-err-sock PATH Specify path for the kernel consumer error socket\n");
+ fprintf(stderr, " --kconsumerd-cmd-sock PATH Specify path for the kernel consumer command socket\n");
+ fprintf(stderr, " -d, --daemonize Start as a daemon.\n");
+ fprintf(stderr, " -g, --group NAME Specify the tracing group name. (default: tracing)\n");
+ fprintf(stderr, " -V, --version Show version number.\n");
+ fprintf(stderr, " -S, --sig-parent Send SIGCHLD to parent pid to notify readiness.\n");
+ fprintf(stderr, " -q, --quiet No output at all.\n");
+ fprintf(stderr, " -v, --verbose Verbose mode. Activate DBG() macro.\n");
}
/*
static struct option long_options[] = {
{ "client-sock", 1, 0, 'c' },
{ "apps-sock", 1, 0, 'a' },
+ { "kconsumerd-cmd-sock", 1, 0, 0 },
+ { "kconsumerd-err-sock", 1, 0, 0 },
{ "daemonize", 0, 0, 'd' },
{ "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' },
{ NULL, 0, 0, 0 }
};
while (1) {
int option_index = 0;
- c = getopt_long(argc, argv, "dhqVS" "a:c:g:s:", long_options, &option_index);
+ c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:E:C:", long_options, &option_index);
if (c == -1) {
break;
}
case 'S':
opt_sig_parent = 1;
break;
+ case 'E':
+ snprintf(kconsumerd_err_unix_sock_path, PATH_MAX, "%s", optarg);
+ break;
+ case 'C':
+ snprintf(kconsumerd_cmd_unix_sock_path, PATH_MAX, "%s", optarg);
+ break;
case 'q':
opt_quiet = 1;
break;
+ case 'v':
+ opt_verbose = 1;
+ break;
default:
/* Unknown option or other error.
* Error is printed by getopt, just return */
* init_daemon_socket
*
* Creates the two needed socket by the daemon.
- * apps_socket - The communication socket for all UST apps.
- * client_socket - The communication of the cli tool (lttng).
+ * apps_sock - The communication socket for all UST apps.
+ * client_sock - The communication of the cli tool (lttng).
*/
static int init_daemon_socket()
{
old_umask = umask(0);
/* Create client tool unix socket */
- client_socket = lttcomm_create_unix_sock(client_unix_sock_path);
- if (client_socket < 0) {
+ client_sock = lttcomm_create_unix_sock(client_unix_sock_path);
+ if (client_sock < 0) {
+ ERR("Create unix sock failed: %s", client_unix_sock_path);
ret = -1;
goto end;
}
/* File permission MUST be 660 */
ret = chmod(client_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (ret < 0) {
+ ERR("Set file permissions failed: %s", client_unix_sock_path);
perror("chmod");
goto end;
}
/* Create the application unix socket */
- apps_socket = lttcomm_create_unix_sock(apps_unix_sock_path);
- if (apps_socket < 0) {
+ apps_sock = lttcomm_create_unix_sock(apps_unix_sock_path);
+ if (apps_sock < 0) {
+ ERR("Create unix sock failed: %s", apps_unix_sock_path);
ret = -1;
goto end;
}
- /* File permission MUST be 660 */
+ /* File permission MUST be 666 */
ret = chmod(apps_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
if (ret < 0) {
+ ERR("Set file permissions failed: %s", apps_unix_sock_path);
perror("chmod");
goto end;
}
}
/*
- * set_socket_perms
+ * set_permissions
+ *
+ * Set the tracing group gid onto the client socket.
*
- * Set the tracing group gid onto the client socket.
+ * Race window between mkdir and chown is OK because we are going from
+ * less permissive (root.root) to more permissive (root.tracing).
*/
-static int set_socket_perms(void)
+static int set_permissions(void)
{
int ret;
struct group *grp;
goto end;
}
+ /* Set lttng run dir */
+ ret = chown(LTTNG_RUNDIR, 0, grp->gr_gid);
+ if (ret < 0) {
+ ERR("Unable to set group on " LTTNG_RUNDIR);
+ perror("chown");
+ }
+
+ /* lttng client socket path */
ret = chown(client_unix_sock_path, 0, grp->gr_gid);
if (ret < 0) {
+ ERR("Unable to set group on %s", client_unix_sock_path);
perror("chown");
}
+ /* kconsumerd error socket path */
+ ret = chown(kconsumerd_err_unix_sock_path, 0, grp->gr_gid);
+ if (ret < 0) {
+ ERR("Unable to set group on %s", kconsumerd_err_unix_sock_path);
+ perror("chown");
+ }
+
+ DBG("All permissions are set");
+
end:
return ret;
}
+/*
+ * create_lttng_rundir
+ *
+ * Create the lttng run directory needed for all
+ * global sockets and pipe.
+ */
+static int create_lttng_rundir(void)
+{
+ int ret;
+
+ ret = mkdir(LTTNG_RUNDIR, S_IRWXU | S_IRWXG );
+ if (ret < 0) {
+ ERR("Unable to create " LTTNG_RUNDIR);
+ goto error;
+ }
+
+error:
+ 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;
+ }
+}
+
+/*
+ * set_kconsumerd_sockets
+ *
+ * Setup sockets and directory needed by the kconsumerd
+ * communication with the session daemon.
+ */
+static int set_kconsumerd_sockets(void)
+{
+ int ret;
+
+ if (strlen(kconsumerd_err_unix_sock_path) == 0) {
+ snprintf(kconsumerd_err_unix_sock_path, PATH_MAX, KCONSUMERD_ERR_SOCK_PATH);
+ }
+
+ if (strlen(kconsumerd_cmd_unix_sock_path) == 0) {
+ snprintf(kconsumerd_cmd_unix_sock_path, PATH_MAX, KCONSUMERD_CMD_SOCK_PATH);
+ }
+
+ ret = mkdir(KCONSUMERD_PATH, S_IRWXU | S_IRWXG);
+ if (ret < 0) {
+ ERR("Failed to create " KCONSUMERD_PATH);
+ goto error;
+ }
+
+ /* Create the kconsumerd error unix socket */
+ kconsumerd_err_sock = lttcomm_create_unix_sock(kconsumerd_err_unix_sock_path);
+ if (kconsumerd_err_sock < 0) {
+ ERR("Create unix sock failed: %s", kconsumerd_err_unix_sock_path);
+ ret = -1;
+ goto error;
+ }
+
+ /* File permission MUST be 660 */
+ ret = chmod(kconsumerd_err_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+ if (ret < 0) {
+ ERR("Set file permissions failed: %s", kconsumerd_err_unix_sock_path);
+ perror("chmod");
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
/*
* set_signal_handler
*
return ret;
}
+ DBG("Signal handler set for SIGTERM, SIGPIPE and SIGINT");
+
return ret;
}
{
switch (sig) {
case SIGPIPE:
+ DBG("SIGPIPE catched");
return;
case SIGINT:
+ DBG("SIGINT catched");
+ cleanup();
+ break;
case SIGTERM:
+ DBG("SIGTERM catched");
cleanup();
break;
default:
*/
static void cleanup()
{
+ int ret;
+ char *cmd;
+
+ DBG("Cleaning up");
+
/* <fun> */
MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm", 27,1,31,27,0);
MSG("%c[%d;%dmMatthew, BEET driven development works!%c[%dm",27,1,33,27,0);
unlink(client_unix_sock_path);
unlink(apps_unix_sock_path);
+ unlink(kconsumerd_err_unix_sock_path);
+
+ ret = asprintf(&cmd, "rm -rf " LTTNG_RUNDIR);
+ if (ret < 0) {
+ ERR("asprintf failed. Something is really wrong!");
+ }
+
+ /* Remove lttng run directory */
+ ret = system(cmd);
+ if (ret < 0) {
+ ERR("Unable to clean " LTTNG_RUNDIR);
+ }
+
+ // TODO Clean kernel trace fds
+ close(kernel_tracer_fd);
}
/*
/* Set all sockets path */
if (is_root) {
+ ret = create_lttng_rundir();
+ if (ret < 0) {
+ goto error;
+ }
+
if (strlen(apps_unix_sock_path) == 0) {
- (snprintf(apps_unix_sock_path, PATH_MAX,
- DEFAULT_GLOBAL_APPS_UNIX_SOCK));
+ snprintf(apps_unix_sock_path, PATH_MAX,
+ DEFAULT_GLOBAL_APPS_UNIX_SOCK);
}
if (strlen(client_unix_sock_path) == 0) {
- (snprintf(client_unix_sock_path, PATH_MAX,
- DEFAULT_GLOBAL_CLIENT_UNIX_SOCK));
+ snprintf(client_unix_sock_path, PATH_MAX,
+ DEFAULT_GLOBAL_CLIENT_UNIX_SOCK);
}
+
+ ret = set_kconsumerd_sockets();
+ if (ret < 0) {
+ goto error;
+ }
+
+ /* Setup kernel tracer */
+ init_kernel_tracer();
} else {
if (strlen(apps_unix_sock_path) == 0) {
- (snprintf(apps_unix_sock_path, PATH_MAX,
- DEFAULT_HOME_APPS_UNIX_SOCK, get_home_dir()));
+ snprintf(apps_unix_sock_path, PATH_MAX,
+ DEFAULT_HOME_APPS_UNIX_SOCK, get_home_dir());
}
/* 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()));
+ snprintf(client_unix_sock_path, PATH_MAX,
+ DEFAULT_HOME_CLIENT_UNIX_SOCK, get_home_dir());
}
}
+ DBG("Client socket path %s", client_unix_sock_path);
+ DBG("Application socket path %s", apps_unix_sock_path);
+
/* See if daemon already exist. If any of the two
* socket needed by the daemon are present, this test fails
*/
if ((ret = check_existing_daemon()) == 0) {
ERR("Already running daemon.\n");
/* We do not goto error because we must not
- * cleanup() because a daemon is already working.
+ * cleanup() because a daemon is already running.
*/
- return EXIT_FAILURE;
+ exit(EXIT_FAILURE);
}
if (set_signal_handler() < 0) {
goto error;
}
- /* Setup the two needed unix socket */
+ /* Setup the needed unix socket */
if (init_daemon_socket() < 0) {
goto error;
}
/* Set credentials to socket */
- if (is_root && (set_socket_perms() < 0)) {
+ if (is_root && (set_permissions() < 0)) {
goto error;
}
}
cleanup();
- return 0;
+ exit(EXIT_SUCCESS);
error:
cleanup();
-
- return EXIT_FAILURE;
+ exit(EXIT_FAILURE);
}
projects / lttng-tools.git / blobdiff