X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng%2Fcommands%2Fdisable_channels.c;h=59ad9fc28f97929526951df06f7b8bcd7d69cb09;hb=734f79bf717d87817623d382c59086dc9e8ef610;hp=a45f3ef092b8aad46cdd9a93d144b7985e1841c8;hpb=6caa2bcc3ec40374ae1c3b81c0179eb3f693de84;p=lttng-tools.git

diff --git a/lttng/commands/disable_channels.c b/lttng/commands/disable_channels.c
index a45f3ef09..59ad9fc28 100644
--- a/lttng/commands/disable_channels.c
+++ b/lttng/commands/disable_channels.c
@@ -30,9 +30,8 @@
 #include "../utils.h"
 
 static char *opt_channels;
-static char *opt_kernel;
+static int opt_kernel;
 static char *opt_session_name;
-static int opt_pid_all;
 static int opt_userspace;
 static char *opt_cmd_name;
 static pid_t opt_pid;
@@ -50,7 +49,6 @@ static struct poptOption long_options[] = {
 	{"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, &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},
 	{0, 0, 0, 0, 0, 0, 0}
 };
@@ -62,12 +60,13 @@ static void usage(FILE *ofp)
 {
 	fprintf(ofp, "usage: lttng disable-channel NAME[,NAME2,...] [options]\n");
 	fprintf(ofp, "\n");
-	fprintf(ofp, "  -h, --help            Show this help\n");
+	fprintf(ofp, "  -h, --help               Show this help\n");
 	fprintf(ofp, "  -s, --session            Apply on session name\n");
-	fprintf(ofp, "  -k, --kernel          Apply for the kernel tracer\n");
-	fprintf(ofp, "  -u, --userspace       Apply for the user-space tracer\n");
-	fprintf(ofp, "      --all             If -u, apply on all traceable apps\n");
-	fprintf(ofp, "  -p, --pid PID         If -u, apply on a specific PID\n");
+	fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
+	fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
+	fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
+	fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
+	fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
 	fprintf(ofp, "\n");
 }
 
@@ -82,6 +81,19 @@ static int disable_channels(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 (-k/--kernel or -u/--userspace)");
+		ret = CMD_NOT_IMPLEMENTED;
+		goto error;
 	}
 
 	handle = lttng_create_handle(session_name, &dom);
@@ -93,27 +105,15 @@ static int disable_channels(char *session_name)
 	/* Strip channel list */
 	channel_name = strtok(opt_channels, ",");
 	while (channel_name != NULL) {
-		/* Kernel tracer action */
-		if (opt_kernel) {
-			DBG("Disabling kernel channel %s", channel_name);
-			ret = lttng_disable_channel(handle, channel_name);
-			if (ret < 0) {
-				goto error;
-			} else {
-				MSG("Kernel channel disabled %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;
+		DBG("Disabling channel %s", channel_name);
+
+		ret = lttng_disable_channel(handle, channel_name);
+		if (ret < 0) {
 			goto error;
 		} else {
-			ERR("Please specify a tracer (--kernel or --userspace)");
-			goto error;
+			MSG("%s channel %s disabled for session %s",
+					opt_kernel ? "Kernel" : "UST", channel_name,
+					session_name);
 		}
 
 		/* Next channel */