X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=21b05fc8621847523169bae1d59d77e3bdf21391;hp=70ce53c8b1cd50c87e1712bc42a2c2e0ba0f9bd4;hb=9bda164defe0c7ef5857d4ef59cc3b464f5a5404;hpb=1657e9bb835a28e66396deac871270fe373d5ff4

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 70ce53c8b..21b05fc86 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -35,7 +35,7 @@
 
 #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"
@@ -44,6 +44,13 @@
 #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;
@@ -52,20 +59,23 @@ const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE;
 
 /* 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 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_data_buffer(char **buf, size_t size, struct lttcomm_lttng_header *llh);
+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 copy_common_data(struct lttcomm_lttng_header *llh, struct lttcomm_session_msg *lsm);
 static void sighandler(int sig);
 
 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;
@@ -77,13 +87,51 @@ static int opt_daemon;
 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_socket;
-static int apps_socket;
+static int client_sock;
+static int apps_sock;
+static int kconsumerd_err_sock;
 
-static struct ltt_session *current_session;
+/* Extern in session.h */
+struct ltt_session *current_session;
+
+/*
+ *  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;
+	}
+
+	while (1) {
+		//ret = lttcomm_recv_unix_sock(sock, &lsm, sizeof(lsm));
+		if (ret <= 0) {
+			/* TODO: Consumerd died? */
+			continue;
+		}
+	}
+
+error:
+	return NULL;
+}
 
 /*
  * 	thread_manage_apps
@@ -95,6 +143,9 @@ static void *thread_manage_apps(void *data)
 	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;
@@ -103,17 +154,17 @@ static void *thread_manage_apps(void *data)
 
 	DBG("[thread] Manage apps started");
 
-	/* Notify all applications to register */
-	notify_apps(default_global_apps_pipe);
-
-	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) {
 		/* Blocking call, waiting for transmission */
-		sock = lttcomm_accept_unix_sock(apps_socket);
+		sock = lttcomm_accept_unix_sock(apps_sock);
 		if (sock < 0) {
 			goto error;
 		}
@@ -161,7 +212,7 @@ static void *thread_manage_clients(void *data)
 
 	DBG("[thread] Manage client started");
 
-	ret = lttcomm_listen_unix_sock(client_socket);
+	ret = lttcomm_listen_unix_sock(client_sock);
 	if (ret < 0) {
 		goto error;
 	}
@@ -175,7 +226,7 @@ static void *thread_manage_clients(void *data)
 
 	while (1) {
 		/* Blocking call, waiting for transmission */
-		sock = lttcomm_accept_unix_sock(client_socket);
+		sock = lttcomm_accept_unix_sock(client_sock);
 		if (sock < 0) {
 			goto error;
 		}
@@ -192,7 +243,7 @@ static void *thread_manage_clients(void *data)
 
 		/* 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
+		 * because there might be more then one lttcomm_lttng_header to
 		 * send out so process_client_msg do both jobs.
 		 */
 		ret = process_client_msg(sock, &lsm);
@@ -224,7 +275,7 @@ static int send_unix_sock(int sock, void *buf, size_t len)
 }
 
 /*
- * 	connect_app
+ * 	ust_connect_app
  *
  * 	Return a socket connected to the libust communication socket
  * 	of the application identified by the pid.
@@ -232,7 +283,7 @@ static int send_unix_sock(int sock, void *buf, size_t len)
  * 	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;
@@ -242,6 +293,7 @@ static int connect_app(pid_t pid)
 	lta = find_app_by_pid(pid);
 	if (lta == NULL) {
 		/* App not found */
+		DBG("Application pid %d not found", pid);
 		return -1;
 	}
 
@@ -285,112 +337,23 @@ error:
 	return ret;
 }
 
-/*
- *  ust_create_trace
- *
- *  Create an userspace trace using pid.
- *  This trace is then appended to the current session
- *  ust trace list.
- */
-static int ust_create_trace(pid_t pid)
-{
-	int sock, ret;
-	struct ltt_ust_trace *trace;
-
-	DBG("Creating trace for pid %d", pid);
-
-	trace = malloc(sizeof(struct ltt_ust_trace));
-	if (trace == NULL) {
-		perror("malloc");
-		ret = -1;
-		goto error;
-	}
-
-	/* Init */
-	trace->pid = pid;
-	trace->shmid = 0;
-	/* NOTE: to be removed. Trace name will no longer be
-	 * required for LTTng userspace tracer. For now, we set it
-	 * to 'auto' for API compliance.
-	 */
-	snprintf(trace->name, 5, "auto");
-
-	/* Connect to app using ustctl API */
-	sock = connect_app(pid);
-	if (sock < 0) {
-		ret = LTTCOMM_NO_TRACEABLE;
-		goto error;
-	}
-
-	ret = ustctl_create_trace(sock, trace->name);
-	if (ret < 0) {
-		ret = LTTCOMM_CREATE_FAIL;
-		goto error;
-	}
-
-	/* Check if current session is valid */
-	if (current_session) {
-		cds_list_add(&trace->list, &current_session->ust_traces);
-		current_session->ust_trace_count++;
-	}
-
-error:
-	return ret;
-}
-
-/*
- *  ust_start_trace
- *
- *  Start a trace. This trace, identified by the pid, must be
- *  in the current session ust_traces list.
- */
-static int ust_start_trace(pid_t pid)
-{
-	int sock, ret;
-	struct ltt_ust_trace *trace;
-
-	DBG("Starting trace for pid %d", pid);
-
-	trace = find_session_ust_trace_by_pid(current_session, pid);
-	if (trace == NULL) {
-		ret = LTTCOMM_NO_TRACE;
-		goto error;
-	}
-
-	/* Connect to app using ustctl API */
-	sock = connect_app(pid);
-	if (sock < 0) {
-		ret = LTTCOMM_NO_TRACEABLE;
-		goto error;
-	}
-
-	ret = ustctl_start_trace(sock, "auto");
-	if (ret < 0) {
-		ret = LTTCOMM_START_FAIL;
-		goto error;
-	}
-
-error:
-	return ret;
-}
-
 /*
  *  copy_common_data
  *
- *  Copy common data between lttcomm_lttng_msg and lttcomm_session_msg
+ *  Copy common data between lttcomm_lttng_header and lttcomm_session_msg
  */
-static void copy_common_data(struct lttcomm_lttng_msg *llm, struct lttcomm_session_msg *lsm)
+static void copy_common_data(struct lttcomm_lttng_header *llh, struct lttcomm_session_msg *lsm)
 {
-	llm->cmd_type = lsm->cmd_type;
-	llm->pid = lsm->pid;
+	llh->cmd_type = lsm->cmd_type;
+	llh->pid = lsm->pid;
 
 	/* Manage uuid */
 	if (!uuid_is_null(lsm->session_id)) {
-		uuid_copy(llm->session_id, lsm->session_id);
+		uuid_copy(llh->session_id, lsm->session_id);
 	}
 
-	strncpy(llm->trace_name, lsm->trace_name, strlen(llm->trace_name));
-	llm->trace_name[strlen(llm->trace_name) - 1] = '\0';
+	strncpy(llh->trace_name, lsm->trace_name, strlen(llh->trace_name));
+	llh->trace_name[strlen(llh->trace_name) - 1] = '\0';
 }
 
 /*
@@ -401,12 +364,12 @@ static void copy_common_data(struct lttcomm_lttng_msg *llm, struct lttcomm_sessi
  *
  *  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)
+static int setup_data_buffer(char **buf, size_t s_data, struct lttcomm_lttng_header *llh)
 {
 	int ret = 0;
 	size_t buf_size;
 
-	buf_size = sizeof(struct lttcomm_lttng_msg) + s_data;
+	buf_size = sizeof(struct lttcomm_lttng_header) + s_data;
 	*buf = malloc(buf_size);
 	if (*buf == NULL) {
 		perror("malloc");
@@ -414,11 +377,11 @@ static int setup_data_buffer(char **buf, size_t s_data, struct lttcomm_lttng_msg
 		goto error;
 	}
 
-	/* Setup lttcomm_lttng_msg data and copy
+	/* Setup lttcomm_lttng_header data and copy
 	 * it to the newly allocated buffer.
 	 */
-	llm->size_payload = s_data;
-	memcpy(*buf, llm, sizeof(struct lttcomm_lttng_msg));
+	llh->payload_size = s_data;
+	memcpy(*buf, llh, sizeof(struct lttcomm_lttng_header));
 
 	return buf_size;
 
@@ -437,160 +400,177 @@ error:
  */
 static int process_client_msg(int sock, struct lttcomm_session_msg *lsm)
 {
-	int ret;
-	int buf_size;
+	int ust_sock, ret, buf_size;
 	size_t header_size;
 	char *send_buf = NULL;
-	struct lttcomm_lttng_msg llm;
+	struct lttcomm_lttng_header llh;
 
 	DBG("Processing client message");
 
 	/* Copy common data to identify the response
 	 * on the lttng client side.
 	 */
-	copy_common_data(&llm, lsm);
+	copy_common_data(&llh, lsm);
 
 	/* 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)
-	{
+	switch (lsm->cmd_type) {
+	case LTTNG_CREATE_SESSION:
+	case LTTNG_LIST_SESSIONS:
+	case UST_LIST_APPS:
+		break;
+	default:
 		current_session = find_session_by_uuid(lsm->session_id);
 		if (current_session == NULL) {
 			ret = LTTCOMM_SELECT_SESS;
 			goto end;
 		}
+		break;
 	}
 
 	/* Default return code.
 	 * In our world, everything is OK... right? ;)
 	 */
-	llm.ret_code = LTTCOMM_OK;
+	llh.ret_code = LTTCOMM_OK;
 
-	header_size = sizeof(struct lttcomm_lttng_msg);
+	header_size = sizeof(struct lttcomm_lttng_header);
+
+	/* Connect to ust apps if available pid */
+	if (lsm->pid != 0) {
+		/* Connect to app using ustctl API */
+		ust_sock = ust_connect_app(lsm->pid);
+		if (ust_sock < 0) {
+			ret = LTTCOMM_NO_TRACEABLE;
+			goto end;
+		}
+	}
 
 	/* 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;
-			}
-
-			buf_size = setup_data_buffer(&send_buf, 0, &llm);
-			if (buf_size < 0) {
+	case LTTNG_CREATE_SESSION:
+	{
+		ret = create_session(lsm->session_name, &llh.session_id);
+		if (ret < 0) {
+			if (ret == -1) {
+				ret = LTTCOMM_EXIST_SESS;
+			} else {
 				ret = LTTCOMM_FATAL;
-				goto end;
 			}
-
-			break;
+			goto end;
 		}
-		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. */
+		buf_size = setup_data_buffer(&send_buf, 0, &llh);
+		if (buf_size < 0) {
+			ret = LTTCOMM_FATAL;
 			goto end;
 		}
-		case LTTNG_LIST_TRACES:
-		{
-			unsigned int trace_count = get_trace_count_per_session(current_session);
 
-			if (trace_count == 0) {
-				ret = LTTCOMM_NO_TRACE;
-				goto end;
-			}
+		break;
+	}
+	case LTTNG_DESTROY_SESSION:
+	{
+		ret = destroy_session(&lsm->session_id);
+		if (ret < 0) {
+			ret = LTTCOMM_NO_SESS;
+		} else {
+			ret = LTTCOMM_OK;
+		}
 
-			buf_size = setup_data_buffer(&send_buf,
-					sizeof(struct lttng_trace) * trace_count, &llm);
-			if (buf_size < 0) {
-				ret = LTTCOMM_FATAL;
-				goto end;
-			}
+		/* No auxiliary data so only send the llh struct. */
+		goto end;
+	}
+	case LTTNG_LIST_TRACES:
+	{
+		unsigned int trace_count = get_trace_count_per_session(current_session);
 
-			get_traces_per_session(current_session, (struct lttng_trace *)(send_buf + header_size));
-			break;
+		if (trace_count == 0) {
+			ret = LTTCOMM_NO_TRACE;
+			goto end;
 		}
-		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. */
+		buf_size = setup_data_buffer(&send_buf,
+				sizeof(struct lttng_trace) * trace_count, &llh);
+		if (buf_size < 0) {
+			ret = LTTCOMM_FATAL;
 			goto end;
 		}
-		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;
-			}
-
-			get_app_list_pids((pid_t *)(send_buf + header_size));
+		get_traces_per_session(current_session, (struct lttng_trace *)(send_buf + header_size));
+		break;
+	}
+	case UST_CREATE_TRACE:
+	{
+		ret = ust_create_trace(ust_sock, 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;
+		}
 
-			break;
+		/* No auxiliary data so only send the llh struct. */
+		goto end;
+	}
+	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;
 		}
-		case UST_START_TRACE:
-		{
-			ret = ust_start_trace(lsm->pid);
 
-			/* No auxiliary data so only send the llm struct. */
+		/* Setup data buffer and details for transmission */
+		buf_size = setup_data_buffer(&send_buf,
+				sizeof(pid_t) * app_count, &llh);
+		if (buf_size < 0) {
+			ret = LTTCOMM_FATAL;
 			goto end;
 		}
-		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;
-			}
 
-			/* 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;
-			}
+		get_app_list_pids((pid_t *)(send_buf + header_size));
 
-			get_lttng_session((struct lttng_session *)(send_buf + header_size));
+		break;
+	}
+	case UST_START_TRACE:
+	{
+		ret = ust_start_trace(ust_sock, lsm->pid);
 
-			break;
+		/* No auxiliary data so only send the llh struct. */
+		goto end;
+	}
+	case UST_STOP_TRACE:
+	{
+		ret = ust_stop_trace(ust_sock, lsm->pid);
+
+		/* No auxiliary data so only send the llh struct. */
+		goto end;
+	}
+	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;
 		}
-		default:
-		{
-			/* Undefined command */
-			ret = LTTCOMM_UND;
+
+		/* Setup data buffer and details for transmission */
+		buf_size = setup_data_buffer(&send_buf,
+				(sizeof(struct lttng_session) * session_count), &llh);
+		if (buf_size < 0) {
+			ret = LTTCOMM_FATAL;
 			goto end;
 		}
+
+		get_lttng_session((struct lttng_session *)(send_buf + header_size));
+
+		break;
+	}
+	default:
+		/* Undefined command */
+		ret = LTTCOMM_UND;
+		goto end;
 	}
 
 	ret = send_unix_sock(sock, send_buf, buf_size);
@@ -602,10 +582,11 @@ static int process_client_msg(int sock, struct lttcomm_session_msg *lsm)
 	return ret;
 
 end:
+	DBG("Return code to client %d", ret);
 	/* Notify client of error */
-	llm.ret_code = ret;
-	llm.size_payload = 0;
-	send_unix_sock(sock, (void*) &llm, sizeof(llm));
+	llh.ret_code = ret;
+	llh.payload_size = 0;
+	send_unix_sock(sock, (void*) &llh, sizeof(llh));
 
 	return ret;
 }
@@ -616,15 +597,17 @@ end:
 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, "  -v, --verbose             Verbose mode. Activate DBG() macro.\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");
 }
 
 /*
@@ -637,6 +620,8 @@ static int parse_args(int argc, char **argv)
 	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' },
@@ -649,7 +634,7 @@ static int parse_args(int argc, char **argv)
 
 	while (1) {
 		int option_index = 0;
-		c = getopt_long(argc, argv, "dhqvVS" "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;
 		}
@@ -682,6 +667,12 @@ static int parse_args(int argc, char **argv)
 		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;
@@ -702,8 +693,8 @@ static int parse_args(int argc, char **argv)
  * 	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()
 {
@@ -713,8 +704,9 @@ 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;
 	}
@@ -722,20 +714,23 @@ static int init_daemon_socket()
 	/* 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;
 	}
@@ -783,11 +778,14 @@ static const char *get_home_dir(void)
 }
 
 /*
- *  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;
@@ -803,17 +801,97 @@ static int set_socket_perms(void)
 		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("Sockets permissions set");
+	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;
+}
+
+/*
+ *  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
  *
@@ -887,6 +965,9 @@ static void sighandler(int sig)
  */
 static void cleanup()
 {
+	int ret;
+	char *cmd;
+
 	DBG("Cleaning up");
 
 	/* <fun> */
@@ -896,6 +977,18 @@ static void cleanup()
 
 	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);
+	}
 }
 
 /*
@@ -928,25 +1021,35 @@ int main(int argc, char **argv)
 
 	/* 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;
 		}
 	} 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());
 		}
 	}
 
@@ -956,22 +1059,22 @@ int main(int argc, char **argv)
 	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;
 	}
 
@@ -1005,10 +1108,9 @@ int main(int argc, char **argv)
 	}
 
 	cleanup();
-	return 0;
+	exit(EXIT_SUCCESS);
 
 error:
 	cleanup();
-
-	return EXIT_FAILURE;
+	exit(EXIT_FAILURE);
 }