X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fdisable_events.c;h=b4d5ecb040d92894d9ab189cdeccff8d18c84afd;hp=5bfe5d55bed891dd143280bb3d64a69374da3065;hb=cd80958d00fddabced5fbd60641978516a01e29e;hpb=e953ef25cbc11fb112aa2e23bf2d44867fe585ed

diff --git a/lttng/commands/disable_events.c b/lttng/commands/disable_events.c
index 5bfe5d55b..b4d5ecb04 100644
--- a/lttng/commands/disable_events.c
+++ b/lttng/commands/disable_events.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,14 +25,15 @@
 #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_event_list;
 static char *opt_kernel;
 static char *opt_cmd_name;
 static char *opt_channel_name;
+static char *opt_session_name;
 static int opt_pid_all;
 static int opt_userspace;
 static int opt_disable_all;
@@ -43,9 +44,12 @@ 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},
+	{"session",        's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
 	{"all-events",     'a', POPT_ARG_VAL, &opt_disable_all, 1, 0, 0},
 	{"channel",        'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
 	{"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
@@ -63,6 +67,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "usage: lttng disable-event 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, "  -c, --channel            Apply on this channel\n");
 	fprintf(ofp, "  -a, --all-events         Enable all tracepoints\n");
 	fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
@@ -77,16 +82,12 @@ static void usage(FILE *ofp)
  *
  *  Disabling event using the lttng API.
  */
-static int disable_events(void)
+static int disable_events(char *session_name)
 {
 	int err, ret = CMD_SUCCESS;
-	char *event_name, *channel_name;
+	char *event_name, *channel_name = NULL;
 	struct lttng_event ev;
-
-	if (set_session_name() < 0) {
-		ret = CMD_ERROR;
-		goto error;
-	}
+	struct lttng_domain dom;
 
 	if (opt_channel_name == NULL) {
 		err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
@@ -98,9 +99,19 @@ static int disable_events(void)
 		channel_name = opt_channel_name;
 	}
 
+	if (opt_kernel) {
+		dom.type = LTTNG_DOMAIN_KERNEL;
+	}
+
+	handle = lttng_create_handle(session_name, &dom);
+	if (handle == NULL) {
+		ret = -1;
+		goto error;
+	}
+
 	if (opt_disable_all) {
 		if (opt_kernel) {
-			ret = lttng_kernel_disable_event(NULL, channel_name);
+			ret = lttng_disable_event(handle, NULL, channel_name);
 			goto error;
 		}
 
@@ -117,7 +128,8 @@ static int disable_events(void)
 
 			/* Copy name and type of the event */
 			strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
-			ret = lttng_kernel_disable_event(event_name, channel_name);
+			ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+			ret = lttng_disable_event(handle, event_name, channel_name);
 			if (ret < 0) {
 				MSG("Unable to disable event %s for channel %s",
 						event_name, channel_name);
@@ -135,7 +147,7 @@ static int disable_events(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;
 		}
 
@@ -144,6 +156,11 @@ static int disable_events(void)
 	}
 
 error:
+	if (opt_channel_name == NULL) {
+		free(channel_name);
+	}
+	lttng_destroy_handle(handle);
+
 	return ret;
 }
 
@@ -156,6 +173,7 @@ int cmd_disable_events(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);
@@ -185,7 +203,17 @@ int cmd_disable_events(int argc, const char **argv)
 		goto end;
 	}
 
-	ret = disable_events();
+	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_events(session_name);
 
 end:
 	return ret;