X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=18f8d020eef5089ef4309ec9608a3ebd5589fcd7;hb=6efe784e2cb20c6698205d5f408bfc173e1cdc57;hp=caada7deb038efd75a6e953ab730dd1826e47566;hpb=0a9c649428b2ea8d4e743aebc12585eeb58fcf64;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index caada7deb..18f8d020e 100644
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -89,7 +89,7 @@ static struct poptOption long_options[] = {
  */
 static void usage(FILE *ofp)
 {
-	fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] [-u|-k] [OPTIONS]\n");
+	fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] (-u | -k) [OPTIONS]\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Options:\n");
 	fprintf(ofp, "  -h, --help               Show this help\n");
@@ -130,8 +130,8 @@ static void usage(FILE *ofp)
 			DEFAULT_UST_PID_CHANNEL_OUTPUT == LTTNG_EVENT_MMAP ? output_mmap : output_splice,
 			DEFAULT_KERNEL_CHANNEL_OUTPUT == LTTNG_EVENT_MMAP ? output_mmap : output_splice,
 			DEFAULT_METADATA_OUTPUT == LTTNG_EVENT_MMAP ? output_mmap : output_splice);
-	fprintf(ofp, "      --buffers-uid        Use per UID buffer (-u only)\n");
-	fprintf(ofp, "      --buffers-pid        Use per PID buffer (-u only)\n");
+	fprintf(ofp, "      --buffers-uid        Use per UID buffer (-u/-j only)\n");
+	fprintf(ofp, "      --buffers-pid        Use per PID buffer (-u/-j only)\n");
 	fprintf(ofp, "      --buffers-global     Use shared buffer for the whole system (-k only)\n");
 	fprintf(ofp, "  -C, --tracefile-size SIZE\n");
 	fprintf(ofp, "                           Maximum size of each tracefile within a stream (in bytes). 0 means unlimited.\n");
@@ -202,24 +202,31 @@ static int enable_channel(char *session_name)
 		}
 	} else if (opt_userspace) {
 		dom.type = LTTNG_DOMAIN_UST;
-		if (opt_buffer_uid) {
-			dom.buf_type = LTTNG_BUFFER_PER_UID;
+		if (opt_buffer_pid) {
+			dom.buf_type = LTTNG_BUFFER_PER_PID;
 		} else {
 			if (opt_buffer_global) {
 				ERR("Buffer type not supported for domain -u");
 				ret = CMD_ERROR;
 				goto error;
 			}
-			dom.buf_type = LTTNG_BUFFER_PER_PID;
+			dom.buf_type = LTTNG_BUFFER_PER_UID;
 		}
 	} else {
-		ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
+		print_missing_domain();
 		ret = CMD_ERROR;
 		goto error;
 	}
 
 	set_default_attr(&dom);
 
+	if (chan.attr.tracefile_size == 0 && chan.attr.tracefile_count) {
+		ERR("Missing option --tracefile-size. "
+				"A file count without a size won't do anything.");
+		ret = CMD_ERROR;
+		goto error;
+	}
+
 	if ((chan.attr.tracefile_size > 0) &&
 			(chan.attr.tracefile_size < chan.attr.subbuf_size)) {
 		WARN("Tracefile size rounded up from (%" PRIu64 ") to subbuffer size (%" PRIu64 ")",
@@ -262,6 +269,7 @@ static int enable_channel(char *session_name)
 			switch (-ret) {
 			case LTTNG_ERR_KERN_CHAN_EXIST:
 			case LTTNG_ERR_UST_CHAN_EXIST:
+			case LTTNG_ERR_CHAN_EXIST:
 				WARN("Channel %s: %s (session %s)", channel_name,
 						lttng_strerror(ret), session_name);
 				goto error;
@@ -273,8 +281,7 @@ static int enable_channel(char *session_name)
 			warn = 1;
 		} else {
 			MSG("%s channel %s enabled for session %s",
-					opt_kernel ? "Kernel" : "UST", channel_name,
-					session_name);
+					get_domain_str(dom.type), channel_name, session_name);
 		}
 
 		/* Next event */