X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=44b0c84ba0bedf98f301c237fbf57e1994660a79;hp=5e99c7987ce59cb7122e6109d198e35d8399b196;hb=7d29a2477524f7ee2ee46a94e538e6141f5ecc0e;hpb=273ea72ccbbffd1d6b9d5478923d30571d503a6c

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 5e99c7987..44b0c84ba 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -49,7 +49,6 @@
 #include "session.h"
 #include "traceable-app.h"
 #include "lttng-kconsumerd.h"
-#include "libustctl.h"
 #include "utils.h"
 
 /*
@@ -226,18 +225,18 @@ static int send_unix_sock(int sock, void *buf, size_t len)
  *
  *  Free memory of a command context structure.
  */
-static void clean_command_ctx(struct command_ctx *cmd_ctx)
+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);
+	DBG("Clean command context structure");
+	if (*cmd_ctx) {
+		if ((*cmd_ctx)->llm) {
+			free((*cmd_ctx)->llm);
 		}
-		if (cmd_ctx->lsm) {
-			free(cmd_ctx->lsm);
+		if ((*cmd_ctx)->lsm) {
+			free((*cmd_ctx)->lsm);
 		}
-		free(cmd_ctx);
-		cmd_ctx = NULL;
+		free(*cmd_ctx);
+		*cmd_ctx = NULL;
 	}
 }
 
@@ -350,6 +349,7 @@ error:
 	return ret;
 }
 
+#ifdef DISABLED
 /*
  * 	ust_connect_app
  *
@@ -380,6 +380,7 @@ static int ust_connect_app(pid_t pid)
 
 	return sock;
 }
+#endif	/* DISABLED */
 
 /*
  * 	notify_apps
@@ -468,7 +469,7 @@ static int update_kernel_pollfd(void)
 	DBG("Updating kernel_pollfd");
 
 	/* Get the number of channel of all kernel session */
-	pthread_mutex_lock(&session_list_ptr->lock);
+	lock_session_list();
 	cds_list_for_each_entry(session, &session_list_ptr->head, list) {
 		lock_session(session);
 		if (session->kernel_session == NULL) {
@@ -505,7 +506,7 @@ static int update_kernel_pollfd(void)
 		}
 		unlock_session(session);
 	}
-	pthread_mutex_unlock(&session_list_ptr->lock);
+	unlock_session_list();
 
 	/* Adding wake up pipe */
 	kernel_pollfd[nb_fd - 2].fd = kernel_poll_pipe[0];
@@ -517,7 +518,7 @@ static int update_kernel_pollfd(void)
 	return nb_fd;
 
 error:
-	pthread_mutex_unlock(&session_list_ptr->lock);
+	unlock_session_list();
 	return -1;
 }
 
@@ -537,7 +538,7 @@ static int update_kernel_stream(int fd)
 
 	DBG("Updating kernel streams for channel fd %d", fd);
 
-	pthread_mutex_lock(&session_list_ptr->lock);
+	lock_session_list();
 	cds_list_for_each_entry(session, &session_list_ptr->head, list) {
 		lock_session(session);
 		if (session->kernel_session == NULL) {
@@ -568,10 +569,10 @@ static int update_kernel_stream(int fd)
 	}
 
 end:
+	unlock_session_list();
 	if (session) {
 		unlock_session(session);
 	}
-	pthread_mutex_unlock(&session_list_ptr->lock);
 	return ret;
 }
 
@@ -1189,7 +1190,6 @@ error:
 static int create_kernel_session(struct ltt_session *session)
 {
 	int ret;
-	struct lttng_channel *chan;
 
 	DBG("Creating kernel session");
 
@@ -1199,12 +1199,6 @@ static int create_kernel_session(struct ltt_session *session)
 		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) {
@@ -1213,20 +1207,34 @@ static int create_kernel_session(struct ltt_session *session)
 		}
 	}
 
-	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;
 }
 
+/*
+ * Using the session list, filled a lttng_session array to send back to the
+ * client for session listing.
+ *
+ * The session list lock MUST be acquired before calling this function. Use
+ * lock_session_list() and unlock_session_list().
+ */
+static void list_lttng_sessions(struct lttng_session *sessions)
+{
+	int i = 0;
+	struct ltt_session *session;
+
+	DBG("Getting all available session");
+	/*
+	 * Iterate over session list and append data after the control struct in
+	 * the buffer.
+	 */
+	cds_list_for_each_entry(session, &session_list_ptr->head, list) {
+		strncpy(sessions[i].path, session->path, PATH_MAX);
+		strncpy(sessions[i].name, session->name, NAME_MAX);
+		i++;
+	}
+}
+
 /*
  * 	process_client_msg
  *
@@ -1273,7 +1281,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	 */
 	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:
@@ -1310,6 +1317,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		}
 	}
 
+#ifdef DISABLED
 	/* Connect to ust apps if available pid */
 	if (cmd_ctx->lsm->pid > 0) {
 		/* Connect to app using ustctl API */
@@ -1319,6 +1327,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 			goto error;
 		}
 	}
+#endif	/* DISABLED */
 
 	/* Process by command type */
 	switch (cmd_ctx->lsm->cmd_type) {
@@ -1327,6 +1336,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		int found = 0, no_event = 0;
 		struct ltt_kernel_channel *chan;
 		struct ltt_kernel_event *event;
+		struct lttng_kernel_context ctx;
 
 		/* Setup lttng message with no payload */
 		ret = setup_lttng_msg(cmd_ctx, 0);
@@ -1339,22 +1349,28 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 			no_event = 1;
 		}
 
+		/* Create Kernel context */
+		ctx.ctx = cmd_ctx->lsm->u.context.ctx.ctx;
+		ctx.u.perf_counter.type = cmd_ctx->lsm->u.context.ctx.u.perf_counter.type;
+		ctx.u.perf_counter.config = cmd_ctx->lsm->u.context.ctx.u.perf_counter.config;
+		strncpy(ctx.u.perf_counter.name,
+				cmd_ctx->lsm->u.context.ctx.u.perf_counter.name,
+				sizeof(ctx.u.perf_counter.name));
+
 		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);
+					ret = kernel_add_channel_context(chan, &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);
+						ret = kernel_add_event_context(event, &ctx);
 						if (ret < 0) {
 							ret = LTTCOMM_KERN_CONTEXT_FAIL;
 							goto error;
@@ -1373,8 +1389,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 			}
 
 			if (no_event) {
-				ret = kernel_add_channel_context(chan,
-						&cmd_ctx->lsm->u.context.ctx);
+				ret = kernel_add_channel_context(chan, &ctx);
 				if (ret < 0) {
 					ret = LTTCOMM_KERN_CONTEXT_FAIL;
 					goto error;
@@ -1382,8 +1397,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 			} 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);
+					ret = kernel_add_event_context(event, &ctx);
 					if (ret < 0) {
 						ret = LTTCOMM_KERN_CONTEXT_FAIL;
 						goto error;
@@ -1400,33 +1414,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		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;
-		}
-
-		/* 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;
-		}
-
-		ret = notify_kernel_pollfd();
-		if (ret < 0) {
-			ret = LTTCOMM_FATAL;
-			goto error;
-		}
-
-		ret = LTTCOMM_OK;
-		break;
-	}
 	case LTTNG_KERNEL_DISABLE_CHANNEL:
 	{
 		struct ltt_kernel_channel *chan;
@@ -1537,8 +1524,22 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		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;
+			/* Channel not found, creating it */
+			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;
+			}
+
+			/* Notify kernel thread that there is a new channel */
+			ret = notify_kernel_pollfd();
+			if (ret < 0) {
+				ret = LTTCOMM_FATAL;
+				goto error;
+			}
 		} else if (chan->enabled == 0) {
 			ret = kernel_enable_channel(chan);
 			if (ret < 0) {
@@ -1555,8 +1556,10 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	}
 	case LTTNG_KERNEL_ENABLE_EVENT:
 	{
-		struct ltt_kernel_channel *chan;
+		char *channel_name;
+		struct ltt_kernel_channel *kchan;
 		struct ltt_kernel_event *ev;
+		struct lttng_channel *chan;
 
 		/* Setup lttng message with no payload */
 		ret = setup_lttng_msg(cmd_ctx, 0);
@@ -1564,22 +1567,42 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 			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;
-		}
+		channel_name = cmd_ctx->lsm->u.enable.channel_name;
 
-		ev = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, chan);
+		do {
+			kchan = get_kernel_channel_by_name(channel_name,
+					cmd_ctx->session->kernel_session);
+			if (kchan == NULL) {
+				DBG("Creating default channel");
+
+				chan = init_default_channel();
+				if (chan == NULL) {
+					ret = LTTCOMM_FATAL;
+					goto error;
+				}
+
+				ret = kernel_create_channel(cmd_ctx->session->kernel_session,
+						chan, cmd_ctx->session->path);
+				if (ret < 0) {
+					ret = LTTCOMM_KERN_CHAN_FAIL;
+					goto error;
+				}
+			}
+		} while (kchan == NULL);
+
+		ev = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan);
 		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);
+					cmd_ctx->lsm->u.enable.event.name, channel_name);
+			ret = kernel_create_event(&cmd_ctx->lsm->u.enable.event, kchan);
 		} else {
 			DBG("Enabling kernel event %s for channel %s.",
-					cmd_ctx->lsm->u.enable.event.name, chan->channel->name);
+					cmd_ctx->lsm->u.enable.event.name, channel_name);
 			ret = kernel_enable_event(ev);
+			if (ret == -EEXIST) {
+				ret = LTTCOMM_KERN_EVENT_EXIST;
+				goto error;
+			}
 		}
 
 		if (ret < 0) {
@@ -1594,10 +1617,11 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	case LTTNG_KERNEL_ENABLE_ALL_EVENT:
 	{
 		int pos, size;
-		char *event_list, *event, *ptr;
-		struct ltt_kernel_channel *chan;
+		char *event_list, *event, *ptr, *channel_name;
+		struct ltt_kernel_channel *kchan;
 		struct ltt_kernel_event *ev;
 		struct lttng_event ev_attr;
+		struct lttng_channel *chan;
 
 		/* Setup lttng message with no payload */
 		ret = setup_lttng_msg(cmd_ctx, 0);
@@ -1607,17 +1631,33 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 		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;
-		}
+		channel_name = cmd_ctx->lsm->u.enable.channel_name;
+
+		do {
+			kchan = get_kernel_channel_by_name(channel_name,
+					cmd_ctx->session->kernel_session);
+			if (kchan == NULL) {
+				DBG("Creating default channel");
+
+				chan = init_default_channel();
+				if (chan == NULL) {
+					ret = LTTCOMM_FATAL;
+					goto error;
+				}
+
+				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;
+				}
+			}
+		} while (kchan == NULL);
 
 		/* For each event in the kernel session */
-		cds_list_for_each_entry(ev, &chan->events_list.head, list) {
+		cds_list_for_each_entry(ev, &kchan->events_list.head, list) {
 			DBG("Enabling kernel event %s for channel %s.",
-					ev->event->name, chan->channel->name);
+					ev->event->name, channel_name);
 			ret = kernel_enable_event(ev);
 			if (ret < 0) {
 				continue;
@@ -1632,13 +1672,13 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 		ptr = event_list;
 		while ((size = sscanf(ptr, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) {
-			ev = get_kernel_event_by_name(event, chan);
+			ev = get_kernel_event_by_name(event, kchan);
 			if (ev == NULL) {
 				strncpy(ev_attr.name, event, LTTNG_SYM_NAME_LEN);
 				/* Default event type for enable all */
-				ev_attr.type = LTTNG_EVENT_TRACEPOINTS;
+				ev_attr.type = LTTNG_EVENT_TRACEPOINT;
 				/* Enable each single tracepoint event */
-				ret = kernel_create_event(&ev_attr, chan);
+				ret = kernel_create_event(&ev_attr, kchan);
 				if (ret < 0) {
 					/* Ignore error here and continue */
 				}
@@ -1938,20 +1978,23 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	*/
 	case LTTNG_LIST_SESSIONS:
 	{
-		unsigned int session_count;
+		lock_session_list();
 
-		session_count = get_session_count();
-		if (session_count == 0) {
+		if (session_list_ptr->count == 0) {
 			ret = LTTCOMM_NO_SESSION;
 			goto error;
 		}
 
-		ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * session_count);
+		ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) *
+				session_list_ptr->count);
 		if (ret < 0) {
 			goto setup_error;
 		}
 
-		get_lttng_session((struct lttng_session *)(cmd_ctx->llm->payload));
+		/* Filled the session array */
+		list_lttng_sessions((struct lttng_session *)(cmd_ctx->llm->payload));
+
+		unlock_session_list();
 
 		ret = LTTCOMM_OK;
 		break;
@@ -2081,7 +2124,7 @@ static void *thread_manage_clients(void *data)
 			/* 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);
+			clean_command_ctx(&cmd_ctx);
 			continue;
 		}
 
@@ -2092,7 +2135,7 @@ static void *thread_manage_clients(void *data)
 			ERR("Failed to send data back to client");
 		}
 
-		clean_command_ctx(cmd_ctx);
+		clean_command_ctx(&cmd_ctx);
 
 		/* End of transmission */
 		close(sock);
@@ -2109,7 +2152,7 @@ error:
 
 	unlink(client_unix_sock_path);
 
-	clean_command_ctx(cmd_ctx);
+	clean_command_ctx(&cmd_ctx);
 	return NULL;
 }
 
@@ -2495,6 +2538,7 @@ static void set_ulimit(void)
 	int ret;
 	struct rlimit lim;
 
+	/* The kernel does not allowed an infinite limit for open files */
 	lim.rlim_cur = 65535;
 	lim.rlim_max = 65535;
 
@@ -2515,14 +2559,13 @@ int main(int argc, char **argv)
 
 	/* Create thread quit pipe */
 	if (init_thread_quit_pipe() < 0) {
-		/* No goto error because nothing is initialized at this point */
-		exit(EXIT_FAILURE);
+		goto exit;
 	}
 
 	/* Parse arguments */
 	progname = argv[0];
 	if ((ret = parse_args(argc, argv) < 0)) {
-		goto error;
+		goto exit;
 	}
 
 	/* Daemonize */
@@ -2530,7 +2573,7 @@ int main(int argc, char **argv)
 		ret = daemon(0, 0);
 		if (ret < 0) {
 			perror("daemon");
-			goto error;
+			goto exit;
 		}
 	}
 
@@ -2540,7 +2583,7 @@ int main(int argc, char **argv)
 	if (is_root) {
 		ret = create_lttng_rundir();
 		if (ret < 0) {
-			goto error;
+			goto exit;
 		}
 
 		if (strlen(apps_unix_sock_path) == 0) {
@@ -2552,23 +2595,12 @@ int main(int argc, char **argv)
 			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();
-
-		/* Set ulimit for open files */
-		set_ulimit();
 	} else {
 		home_path = get_home_dir();
 		if (home_path == NULL) {
 			/* TODO: Add --socket PATH option */
 			ERR("Can't get HOME directory for sockets creation.");
-			goto error;
+			goto exit;
 		}
 
 		if (strlen(apps_unix_sock_path) == 0) {
@@ -2594,10 +2626,31 @@ 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 running.
+		 * We do not goto error because we must not cleanup() because a daemon
+		 * is already running.
 		 */
-		exit(EXIT_FAILURE);
+		goto exit;
+	}
+
+	/* After this point, we can safely call cleanup() so goto error is used */
+
+	/*
+	 * These actions must be executed as root. We do that *after* setting up
+	 * the sockets path because we MUST make the check for another daemon using
+	 * those paths *before* trying to set the kernel consumer sockets and init
+	 * kernel tracer.
+	 */
+	if (is_root) {
+		ret = set_kconsumerd_sockets();
+		if (ret < 0) {
+			goto error;
+		}
+
+		/* Setup kernel tracer */
+		init_kernel_tracer();
+
+		/* Set ulimit for open files */
+		set_ulimit();
 	}
 
 	if (set_signal_handler() < 0) {
@@ -2664,5 +2717,7 @@ int main(int argc, char **argv)
 
 error:
 	cleanup();
+
+exit:
 	exit(EXIT_FAILURE);
 }