X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fdisable_channels.c;h=c23019b45fc67d430e40f87602031526e48c0b61;hp=ad2f0bf0829d26d7420b19f99bcc862c3ad895f9;hb=6e2d116c6138874c0357b1afb1db5aa7cd80ceb6;hpb=26cc6b4e17dc888cd894ef1f42a83c59d7f8a95f

diff --git a/lttng/commands/disable_channels.c b/lttng/commands/disable_channels.c
index ad2f0bf08..c23019b45 100644
--- a/lttng/commands/disable_channels.c
+++ b/lttng/commands/disable_channels.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,12 +25,13 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_channels;
 static char *opt_kernel;
+static char *opt_session_name;
 static int opt_pid_all;
 static int opt_userspace;
 static pid_t opt_pid;
@@ -43,6 +44,7 @@ enum {
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{"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_NONE, 0, OPT_USERSPACE, 0, 0},
 	{"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
@@ -58,6 +60,7 @@ 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, "  -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");
@@ -74,19 +77,24 @@ static int disable_channels(void)
 {
 	int ret = CMD_SUCCESS;
 	char *channel_name;
+	struct lttng_domain dom;
 
-	if (set_session_name() < 0) {
+	if (set_session_name(opt_session_name) < 0) {
 		ret = CMD_ERROR;
 		goto error;
 	}
 
+	if (opt_kernel) {
+		dom.type = LTTNG_DOMAIN_KERNEL;
+	}
+
 	/* 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_kernel_disable_channel(channel_name);
+			ret = lttng_disable_channel(&dom, channel_name);
 			if (ret < 0) {
 				goto error;
 			} else {