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

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index ba5b7b45a..715552b5b 100644
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -104,9 +104,7 @@ static void usage(FILE *ofp)
 }
 
 /*
- *  enable_channel
- *
- *  Adding channel using the lttng API.
+ * Adding channel using the lttng API.
  */
 static int enable_channel(char *session_name)
 {
@@ -116,6 +114,19 @@ static int enable_channel(char *session_name)
 
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
+	} else if (opt_pid != 0) {
+		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;
 	}
 
 	handle = lttng_create_handle(session_name, &dom);
@@ -124,35 +135,21 @@ static int enable_channel(char *session_name)
 		goto error;
 	}
 
-	/* Strip event list */
+	/* Strip channel list (format: chan1,chan2,...) */
 	channel_name = strtok(opt_channels, ",");
 	while (channel_name != NULL) {
-		/* Kernel tracer action */
-		if (opt_kernel) {
-			DBG("Enabling kernel channel %s", channel_name);
+		/* Copy channel name and normalize it */
+		strncpy(chan.name, channel_name, NAME_MAX);
+		chan.name[NAME_MAX - 1] = '\0';
 
-			/* Copy channel name and normalize it */
-			strncpy(chan.name, channel_name, NAME_MAX);
-			chan.name[NAME_MAX - 1] = '\0';
+		DBG("Enabling channel %s", channel_name);
 
-			ret = lttng_enable_channel(handle, &chan);
-			if (ret < 0) {
-				goto error;
-			} else {
-				MSG("Kernel channel enabled %s", channel_name);
-			}
-		} else if (opt_userspace) {		/* User-space tracer action */
-			/*
-			 * TODO: Waiting on lttng UST 2.0
-			 */
-			if (opt_pid_all) {
-			} else if (opt_pid != 0) {
-			}
-			ret = CMD_NOT_IMPLEMENTED;
+		ret = lttng_enable_channel(handle, &chan);
+		if (ret < 0) {
 			goto error;
 		} else {
-			ERR("Please specify a tracer (--kernel or --userspace)");
-			goto error;
+			MSG("Channel enabled %s for session %s",
+					channel_name, session_name);
 		}
 
 		/* Next event */
@@ -166,9 +163,7 @@ error:
 }
 
 /*
- *  init_channel_config
- *
- *  Default value for channel configuration.
+ * Default value for channel configuration.
  */
 static void init_channel_config(void)
 {
@@ -187,14 +182,14 @@ 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;
 	}
 }
 
 /*
- *  Add channel to trace session
+ * Add channel to trace session
  */
 int cmd_enable_channels(int argc, const char **argv)
 {