X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fdisable_channels.c;h=9a816e3efb0bc652663492d224d038dc05dba253;hp=4235fbf86f56b1724acfb5fd99f0c8cbee2985a6;hb=cd80958d00fddabced5fbd60641978516a01e29e;hpb=5440dc4282b3186641a8886dc05f6cf5641b5191

diff --git a/lttng/commands/disable_channels.c b/lttng/commands/disable_channels.c
index 4235fbf86..9a816e3ef 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,9 +25,9 @@
 #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;
@@ -41,6 +41,8 @@ enum {
 	OPT_USERSPACE,
 };
 
+static struct lttng_handle *handle;
+
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
@@ -69,17 +71,21 @@ static void usage(FILE *ofp)
 }
 
 /*
- *  disable_channels
- *
- *  Disabling channel using the lttng API.
+ * Disabling channel using the lttng API.
  */
-static int disable_channels(void)
+static int disable_channels(char *session_name)
 {
 	int ret = CMD_SUCCESS;
 	char *channel_name;
+	struct lttng_domain dom;
 
-	if (set_session_name(opt_session_name) < 0) {
-		ret = CMD_ERROR;
+	if (opt_kernel) {
+		dom.type = LTTNG_DOMAIN_KERNEL;
+	}
+
+	handle = lttng_create_handle(session_name, &dom);
+	if (handle == NULL) {
+		ret = -1;
 		goto error;
 	}
 
@@ -89,7 +95,7 @@ static int disable_channels(void)
 		/* Kernel tracer action */
 		if (opt_kernel) {
 			DBG("Disabling kernel channel %s", channel_name);
-			ret = lttng_kernel_disable_channel(channel_name);
+			ret = lttng_disable_channel(handle, channel_name);
 			if (ret < 0) {
 				goto error;
 			} else {
@@ -105,7 +111,7 @@ static int disable_channels(void)
 			ret = CMD_NOT_IMPLEMENTED;
 			goto error;
 		} else {
-			ERR("Please specify a tracer (kernel or user-space)");
+			ERR("Please specify a tracer (--kernel or --userspace)");
 			goto error;
 		}
 
@@ -114,6 +120,8 @@ static int disable_channels(void)
 	}
 
 error:
+	lttng_destroy_handle(handle);
+
 	return ret;
 }
 
@@ -126,6 +134,7 @@ int cmd_disable_channels(int argc, const char **argv)
 {
 	int opt, ret;
 	static poptContext pc;
+	char *session_name = NULL;
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -154,7 +163,17 @@ int cmd_disable_channels(int argc, const char **argv)
 		goto end;
 	}
 
-	ret = disable_channels();
+	if (!opt_session_name) {
+		session_name = get_session_name();
+		if (session_name == NULL) {
+			ret = -1;
+			goto end;
+		}
+	} else {
+		session_name = opt_session_name;
+	}
+
+	ret = disable_channels(session_name);
 
 end:
 	return ret;