X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_events.c;h=f9dc3396bf1377ae7caadd10bf780cb3e612a6fc;hb=850767541647c102a299d7fbc39c97555ac70224;hp=c0b8bf9d012d53ed908a8bea019d7ba64955a851;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/disable_events.c b/src/bin/lttng/commands/disable_events.c
index c0b8bf9d0..f9dc3396b 100644
--- a/src/bin/lttng/commands/disable_events.c
+++ b/src/bin/lttng/commands/disable_events.c
@@ -69,25 +69,31 @@ static struct poptOption long_options[] = {
  */
 static void usage(FILE *ofp)
 {
-	fprintf(ofp, "usage: lttng disable-event NAME[,NAME2,...] [options]\n");
+	fprintf(ofp, "usage: lttng disable-event NAME[,NAME2,...] (-k | -u) [OPTIONS]\n");
 	fprintf(ofp, "\n");
+	fprintf(ofp, "Options:\n");
 	fprintf(ofp, "  -h, --help               Show this help\n");
 	fprintf(ofp, "      --list-options       Simple listing of options\n");
-	fprintf(ofp, "  -s, --session            Apply to session name\n");
-	fprintf(ofp, "  -c, --channel            Apply to this channel\n");
+	fprintf(ofp, "  -s, --session NAME       Apply to session name\n");
+	fprintf(ofp, "  -c, --channel NAME       Apply to this channel\n");
 	fprintf(ofp, "  -a, --all-events         Disable all tracepoints\n");
 	fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
-#if 0
-	fprintf(ofp, "  -u, --userspace [CMD]    Apply to the user-space tracer\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");
-#else
 	fprintf(ofp, "  -u, --userspace          Apply to the user-space tracer\n");
-#endif
 	fprintf(ofp, "\n");
 }
 
+static
+const char *print_channel_name(const char *name)
+{
+	return name ? : DEFAULT_CHANNEL_NAME;
+}
+
+static
+const char *print_raw_channel_name(const char *name)
+{
+	return name ? : "<default>";
+}
+
 /*
  *  disable_events
  *
@@ -95,7 +101,7 @@ static void usage(FILE *ofp)
  */
 static int disable_events(char *session_name)
 {
-	int err, ret = CMD_SUCCESS, warn = 0;
+	int ret = CMD_SUCCESS, warn = 0;
 	char *event_name, *channel_name = NULL;
 	struct lttng_domain dom;
 
@@ -112,16 +118,7 @@ static int disable_events(char *session_name)
 		goto error;
 	}
 
-	/* Get channel name */
-	if (opt_channel_name == NULL) {
-		err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
-		if (err < 0) {
-			ret = CMD_FATAL;
-			goto error;
-		}
-	} else {
-		channel_name = opt_channel_name;
-	}
+	channel_name = opt_channel_name;
 
 	handle = lttng_create_handle(session_name, &dom);
 	if (handle == NULL) {
@@ -132,12 +129,13 @@ static int disable_events(char *session_name)
 	if (opt_disable_all) {
 		ret = lttng_disable_event(handle, NULL, channel_name);
 		if (ret < 0) {
-			/* Don't set ret so lttng can interpret the sessiond error. */
+			ERR("%s", lttng_strerror(ret));
 			goto error;
 		}
 
 		MSG("All %s events are disabled in channel %s",
-				opt_kernel ? "kernel" : "UST", channel_name);
+				opt_kernel ? "kernel" : "UST",
+				print_channel_name(channel_name));
 		goto end;
 	}
 
@@ -149,11 +147,16 @@ static int disable_events(char *session_name)
 		ret = lttng_disable_event(handle, event_name, channel_name);
 		if (ret < 0) {
 			ERR("Event %s: %s (channel %s, session %s)", event_name,
-					lttng_strerror(ret), channel_name, session_name);
+					lttng_strerror(ret),
+					ret == -LTTNG_ERR_NEED_CHANNEL_NAME
+						? print_raw_channel_name(channel_name)
+						: print_channel_name(channel_name),
+					session_name);
 			warn = 1;
 		} else {
 			MSG("%s event %s disabled in channel %s for session %s",
-					opt_kernel ? "kernel" : "UST", event_name, channel_name,
+					opt_kernel ? "kernel" : "UST", event_name,
+					print_channel_name(channel_name),
 					session_name);
 		}
 
@@ -168,9 +171,6 @@ error:
 	if (warn) {
 		ret = CMD_WARNING;
 	}
-	if (opt_channel_name == NULL) {
-		free(channel_name);
-	}
 	lttng_destroy_handle(handle);
 
 	return ret;