X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_channels.c;h=bdbb657921ce3483d052dca50b9e0f7a3831eba2;hb=dad47fc4c65ec0acbfedc676895833b465d25cd6;hp=f2e181971b50993ecd423a343e9d4615ad26d940;hpb=c399183f4b3257c43915f3d81f44befd23165ad9;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/disable_channels.c b/src/bin/lttng/commands/disable_channels.c
index f2e181971..bdbb65792 100644
--- a/src/bin/lttng/commands/disable_channels.c
+++ b/src/bin/lttng/commands/disable_channels.c
@@ -31,12 +31,16 @@ static char *opt_channels;
 static int opt_kernel;
 static char *opt_session_name;
 static int opt_userspace;
+#if 0
+/* Not implemented yet */
 static char *opt_cmd_name;
 static pid_t opt_pid;
+#endif
 
 enum {
 	OPT_HELP = 1,
 	OPT_USERSPACE,
+	OPT_LIST_OPTIONS,
 };
 
 static struct lttng_handle *handle;
@@ -46,8 +50,14 @@ 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},
+#if 0
+	/* Not implemented yet */
 	{"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
 	{"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
+#else
+	{"userspace",      'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
+#endif
+	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -59,12 +69,17 @@ 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, "      --list-options       Simple listing of options\n");
 	fprintf(ofp, "  -s, --session            Apply on session name\n");
 	fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
+#if 0
 	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");
+#else
+	fprintf(ofp, "  -u, --userspace          Apply for the user-space tracer\n");
+#endif
 	fprintf(ofp, "\n");
 }
 
@@ -77,20 +92,14 @@ static int disable_channels(char *session_name)
 	char *channel_name;
 	struct lttng_domain dom;
 
+	/* Create lttng domain */
 	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) {
+	} else if (opt_userspace) {
 		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;
+		ret = CMD_ERROR;
 		goto error;
 	}
 
@@ -147,6 +156,10 @@ int cmd_disable_channels(int argc, const char **argv)
 		case OPT_USERSPACE:
 			opt_userspace = 1;
 			break;
+		case OPT_LIST_OPTIONS:
+			list_cmd_options(stdout, long_options);
+			ret = CMD_SUCCESS;
+			goto end;
 		default:
 			usage(stderr);
 			ret = CMD_UNDEFINED;