X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fdisable_events.c;h=5247110ef3ca67a0c514a6110b0762564f8f8eb3;hp=f30a2b28ac4ea629f7ea0266b6574b3d4e90630a;hb=734f79bf717d87817623d382c59086dc9e8ef610;hpb=f84efadf55274918ca038a4e06e0a8af1a320654

diff --git a/lttng/commands/disable_events.c b/lttng/commands/disable_events.c
index f30a2b28a..5247110ef 100644
--- a/lttng/commands/disable_events.c
+++ b/lttng/commands/disable_events.c
@@ -30,12 +30,11 @@
 #include "../utils.h"
 
 static char *opt_event_list;
-static char *opt_kernel;
-static char *opt_cmd_name;
+static int opt_kernel;
 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;
 
@@ -53,8 +52,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},
-	{"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
+	{"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
 	{"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
@@ -69,11 +67,12 @@ static void usage(FILE *ofp)
 	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, "  -a, --all-events         Disable all tracepoints\n");
 	fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
 	fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
-	fprintf(ofp, "      --all                If -u, apply on all traceable apps\n");
-	fprintf(ofp, "  -p, --pid PID            If -u, apply on a specific PID\n");
+	fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
+	fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
+	fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
 	fprintf(ofp, "\n");
 }
 
@@ -98,8 +97,29 @@ static int disable_events(char *session_name)
 		channel_name = opt_channel_name;
 	}
 
+	if (opt_kernel && opt_userspace) {
+		ERR("Can't use -k/--kernel and -u/--userspace together");
+		ret = CMD_FATAL;
+		goto error;
+	}
+
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
+	} else if (opt_pid != 0) {
+		dom.type = LTTNG_DOMAIN_UST_PID;
+		dom.attr.pid = opt_pid;
+		DBG("PID %d set to lttng handle", opt_pid);
+	} else if (opt_userspace && opt_cmd_name == NULL) {
+		dom.type = LTTNG_DOMAIN_UST;
+		DBG("UST global domain selected");
+	} else if (opt_userspace && opt_cmd_name != NULL) {
+		dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
+		strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
+		dom.attr.exec_name[NAME_MAX - 1] = '\0';
+	} else {
+		ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
+		ret = CMD_NOT_IMPLEMENTED;
+		goto error;
 	}
 
 	handle = lttng_create_handle(session_name, &dom);
@@ -109,12 +129,14 @@ static int disable_events(char *session_name)
 	}
 
 	if (opt_disable_all) {
-		if (opt_kernel) {
-			ret = lttng_disable_event(handle, NULL, channel_name);
+		ret = lttng_disable_event(handle, NULL, channel_name);
+		if (ret < 0) {
 			goto error;
 		}
 
-		/* TODO: User-space tracer */
+		MSG("All %s events are disabled in channel %s",
+				opt_kernel ? "kernel" : "UST", channel_name);
+		goto end;
 	}
 
 	/* Strip event list */
@@ -122,35 +144,37 @@ static int disable_events(char *session_name)
 	while (event_name != NULL) {
 		/* Kernel tracer action */
 		if (opt_kernel) {
-			DBG("Disabling kernel event %s for channel %s",
+			DBG("Disabling kernel event %s in channel %s",
 					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);
-			} else {
-				MSG("Kernel event %s disabled for channel %s",
-						event_name, channel_name);
-			}
 		} else if (opt_userspace) {		/* User-space tracer action */
-			/*
-			 * TODO: Waiting on lttng UST 2.0
-			 */
-			if (opt_pid_all) {
-			} else if (opt_pid != 0) {
+			if (opt_cmd_name != NULL || opt_pid) {
+				MSG("Only supporting tracing all UST processes (-u) for now.");
+				ret = CMD_NOT_IMPLEMENTED;
+				goto error;
 			}
-			ret = CMD_NOT_IMPLEMENTED;
-			goto error;
+			DBG("Disabling UST event %s in channel %s",
+					event_name, channel_name);
 		} else {
-			ERR("Please specify a tracer (--kernel or --userspace)");
+			ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
 			goto error;
 		}
 
+		ret = lttng_disable_event(handle, event_name, channel_name);
+		if (ret < 0) {
+			MSG("Unable to disable %s event %s in channel %s",
+					opt_kernel ? "kernel" : "UST", event_name,
+					channel_name);
+		} else {
+			MSG("%s event %s disabled in channel %s",
+					opt_kernel ? "kernel" : "UST", event_name,
+					channel_name);
+		}
+
 		/* Next event */
 		event_name = strtok(NULL, ",");
 	}
 
+end:
 error:
 	if (opt_channel_name == NULL) {
 		free(channel_name);
@@ -182,7 +206,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);