X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_channels.c;h=715552b5b706a811a853028cfa9953db31e6c9b8;hb=f6a9efaa0fe496b7fa4850daa2eae98a240433e1;hp=13511cc869803097edff9bc2542a35218b38e870;hpb=a881057e930058e657a55f0b07ce304bf14d86be;p=lttng-tools.git

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index 13511cc86..715552b5b 100644
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -118,6 +118,11 @@ 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;
@@ -177,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;
 	}
 }