X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_channels.c;h=48e83df28a53039ad90f09d34f65ce74d03c3961;hb=6caa2bcc3ec40374ae1c3b81c0179eb3f693de84;hp=c5887d07bf17ac10688e3dbb3b74bc6d57564ddc;hpb=0b0dd29a48f5855eeb7cda99efaa079d8353eb6b;p=lttng-tools.git

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index c5887d07b..48e83df28 100644
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -36,6 +36,7 @@ static char *opt_cmd_name;
 static char *opt_session_name;
 static int opt_pid_all;
 static int opt_userspace;
+static char *opt_cmd_name;
 static pid_t opt_pid;
 static struct lttng_channel chan;
 
@@ -57,7 +58,7 @@ static struct poptOption long_options[] = {
 	{"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
 	{"session",        's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
 	{"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
-	{"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, 0, OPT_USERSPACE, 0, 0},
+	{"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
 	{"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
 	{"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
 	{"discard",        0,   POPT_ARG_NONE, 0, OPT_DISCARD, 0, 0},
@@ -118,6 +119,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;
@@ -203,10 +209,6 @@ int cmd_enable_channels(int argc, const char **argv)
 			usage(stderr);
 			ret = CMD_SUCCESS;
 			goto end;
-		case OPT_USERSPACE:
-			opt_userspace = 1;
-			opt_cmd_name = poptGetOptArg(pc);
-			break;
 		case OPT_DISCARD:
 			chan.attr.overwrite = 0;
 			DBG("Channel set to discard");
@@ -231,6 +233,9 @@ int cmd_enable_channels(int argc, const char **argv)
 			chan.attr.read_timer_interval = atoi(poptGetOptArg(pc));
 			DBG("Channel read timer interval set to %d", chan.attr.read_timer_interval);
 			break;
+		case OPT_USERSPACE:
+			opt_userspace = 1;
+			break;
 		default:
 			usage(stderr);
 			ret = CMD_UNDEFINED;