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

diff --git a/lttng/commands/disable_events.c b/lttng/commands/disable_events.c
index 5bfe5d55b..3cd130e57 100644
--- a/lttng/commands/disable_events.c
+++ b/lttng/commands/disable_events.c
@@ -33,6 +33,7 @@ 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;
@@ -46,6 +47,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},
 	{"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 +65,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");
@@ -80,10 +83,10 @@ static void usage(FILE *ofp)
 static int disable_events(void)
 {
 	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) {
+	if (set_session_name(opt_session_name) < 0) {
 		ret = CMD_ERROR;
 		goto error;
 	}
@@ -144,6 +147,9 @@ static int disable_events(void)
 	}
 
 error:
+	if (opt_channel_name == NULL) {
+		free(channel_name);
+	}
 	return ret;
 }