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

diff --git a/lttng/commands/disable_events.c b/lttng/commands/disable_events.c
index 3cd130e57..13ebd6c3a 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,17 +25,17 @@
 #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 char *opt_cmd_name;
 static int opt_disable_all;
 static pid_t opt_pid;
 
@@ -44,6 +44,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},
@@ -51,7 +53,7 @@ static struct poptOption long_options[] = {
 	{"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},
-	{"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, 0, OPT_USERSPACE, 0, 0},
+	{"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
 	{"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
 	{"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
@@ -80,16 +82,11 @@ 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 = NULL;
-	struct lttng_event ev;
-
-	if (set_session_name(opt_session_name) < 0) {
-		ret = CMD_ERROR;
-		goto error;
-	}
+	struct lttng_domain dom;
 
 	if (opt_channel_name == NULL) {
 		err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
@@ -101,9 +98,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;
 		}
 
@@ -118,9 +125,7 @@ static int disable_events(void)
 			DBG("Disabling kernel event %s for channel %s",
 					event_name, channel_name);
 
-			/* 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);
+			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);
@@ -138,7 +143,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;
 		}
 
@@ -150,6 +155,8 @@ error:
 	if (opt_channel_name == NULL) {
 		free(channel_name);
 	}
+	lttng_destroy_handle(handle);
+
 	return ret;
 }
 
@@ -162,6 +169,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);
@@ -174,7 +182,6 @@ int cmd_disable_events(int argc, const char **argv)
 			goto end;
 		case OPT_USERSPACE:
 			opt_userspace = 1;
-			opt_cmd_name = poptGetOptArg(pc);
 			break;
 		default:
 			usage(stderr);
@@ -191,7 +198,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;