X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=470ab18188b162b38a2f98bfef1b94fb07eec0aa;hp=652798d348c2f05ab6f45ff5020abeccfd036329;hb=b389abbe14d653f704fcf8f952539cc5ce775c53;hpb=751667bdf3d5d79ca89a6dcf1a2d8155c8cfbc3c

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 652798d34..470ab1818 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -1241,7 +1241,8 @@ static int notify_kernel_pollfd(void)
 /*
  * Allocate a channel structure and fill it.
  */
-static struct lttng_channel *init_default_channel(char *name)
+static struct lttng_channel *init_default_channel(enum lttng_domain_type domain_type,
+						char *name)
 {
 	struct lttng_channel *chan;
 
@@ -1253,18 +1254,29 @@ static struct lttng_channel *init_default_channel(char *name)
 
 	if (snprintf(chan->name, NAME_MAX, "%s", name) < 0) {
 		perror("snprintf channel name");
-		return NULL;
+		goto error;
 	}
 
 	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:
+	switch (domain_type) {
+	case LTTNG_DOMAIN_KERNEL:
+		chan->attr.subbuf_size = DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE;
+		chan->attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
+		chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
+		break;
+		/* TODO: add UST */
+	default:
+		goto error;	/* Not implemented */
+	}
+
 	return chan;
+
+error:
+	free(chan);
+	return NULL;
 }
 
 /*
@@ -1713,26 +1725,32 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 		switch (cmd_ctx->lsm->domain.type) {
 		case LTTNG_DOMAIN_KERNEL:
-			do {
+			kchan = get_kernel_channel_by_name(channel_name,
+					cmd_ctx->session->kernel_session);
+			if (kchan == NULL) {
+				DBG("Channel not found. Creating channel %s", channel_name);
+
+				chan = init_default_channel(cmd_ctx->lsm->domain.type, channel_name);
+				if (chan == NULL) {
+					ret = LTTCOMM_FATAL;
+					goto error;
+				}
+
+				ret = kernel_create_channel(cmd_ctx->session->kernel_session,
+						chan, cmd_ctx->session->kernel_session->trace_path);
+				if (ret < 0) {
+					ret = LTTCOMM_KERN_CHAN_FAIL;
+					goto error;
+				}
 				kchan = get_kernel_channel_by_name(channel_name,
 						cmd_ctx->session->kernel_session);
 				if (kchan == NULL) {
-					DBG("Channel not found. Creating channel %s", channel_name);
-
-					chan = init_default_channel(channel_name);
-					if (chan == NULL) {
-						ret = LTTCOMM_FATAL;
-						goto error;
-					}
-
-					ret = kernel_create_channel(cmd_ctx->session->kernel_session,
-							chan, cmd_ctx->session->kernel_session->trace_path);
-					if (ret < 0) {
-						ret = LTTCOMM_KERN_CHAN_FAIL;
-						goto error;
-					}
+					ERR("Channel %s not found after creation. Internal error, giving up.",
+						channel_name);
+					ret = LTTCOMM_FATAL;
+					goto error;
 				}
-			} while (kchan == NULL);
+			}
 
 			kevent = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan);
 			if (kevent == NULL) {
@@ -1785,26 +1803,32 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 		switch (cmd_ctx->lsm->domain.type) {
 		case LTTNG_DOMAIN_KERNEL:
-			do {
+			kchan = get_kernel_channel_by_name(channel_name,
+					cmd_ctx->session->kernel_session);
+			if (kchan == NULL) {
+				DBG("Channel not found. Creating channel %s", channel_name);
+
+				chan = init_default_channel(cmd_ctx->lsm->domain.type, channel_name);
+				if (chan == NULL) {
+					ret = LTTCOMM_FATAL;
+					goto error;
+				}
+
+				ret = kernel_create_channel(cmd_ctx->session->kernel_session,
+						chan, cmd_ctx->session->kernel_session->trace_path);
+				if (ret < 0) {
+					ret = LTTCOMM_KERN_CHAN_FAIL;
+					goto error;
+				}
 				kchan = get_kernel_channel_by_name(channel_name,
 						cmd_ctx->session->kernel_session);
 				if (kchan == NULL) {
-					DBG("Channel not found. Creating channel %s", channel_name);
-
-					chan = init_default_channel(channel_name);
-					if (chan == NULL) {
-						ret = LTTCOMM_FATAL;
-						goto error;
-					}
-
-					ret = kernel_create_channel(cmd_ctx->session->kernel_session,
-							chan, cmd_ctx->session->kernel_session->trace_path);
-					if (ret < 0) {
-						ret = LTTCOMM_KERN_CHAN_FAIL;
-						goto error;
-					}
+					ERR("Channel %s not found after creation. Internal error, giving up.",
+						channel_name);
+					ret = LTTCOMM_FATAL;
+					goto error;
 				}
-			} while (kchan == NULL);
+			}
 
 			/* For each event in the kernel session */
 			cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {