X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_channels.c;h=715552b5b706a811a853028cfa9953db31e6c9b8;hp=d8ad2a77b67a548df98ac10c6077e5f46481642e;hb=f6a9efaa0fe496b7fa4850daa2eae98a240433e1;hpb=0fdd1e2c4a9f725daed3f91dd4f5609ae54ebe93

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index d8ad2a77b..715552b5b 100644
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -118,7 +118,13 @@ static int enable_channel(char *session_name)
 		dom.type = LTTNG_DOMAIN_UST_PID;
 		dom.attr.pid = opt_pid;
 		DBG("PID %d set to lttng handle", opt_pid);
+	} else if (opt_userspace && opt_cmd_name == NULL) {
+		dom.type = LTTNG_DOMAIN_UST;
+	} else if (opt_userspace && opt_cmd_name != NULL) {
+		dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
+		strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
 	} else {
+		ERR("Please specify a tracer (--kernel or --userspace)");
 		ret = CMD_NOT_IMPLEMENTED;
 		goto error;
 	}
@@ -127,9 +133,6 @@ static int enable_channel(char *session_name)
 	if (handle == NULL) {
 		ret = -1;
 		goto error;
-	} else {
-		ERR("Please specify a tracer (--kernel or --userspace)");
-		goto error;
 	}
 
 	/* Strip channel list (format: chan1,chan2,...) */
@@ -179,8 +182,8 @@ static void init_channel_config(void)
 		chan.attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
 		chan.attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
 
-		chan.attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE;
-		chan.attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM;
+		chan.attr.subbuf_size = DEFAULT_UST_CHANNEL_SUBBUF_SIZE;
+		chan.attr.num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
 		chan.attr.output = DEFAULT_CHANNEL_OUTPUT;
 	}
 }