X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=7f25a6e91aa8bf96708e434358294026176aabff;hb=f2b2a1ab859e70c9c9f537b7e9dd01eea4226b28;hp=b59c05861beeb021b0c1327def90381fe21378a4;hpb=06c0da969b6b69e68029df1db6e625a409cb989f;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index b59c05861..7f25a6e91 100644
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -130,12 +130,14 @@ 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/-j only)\n");
-	fprintf(ofp, "      --buffers-pid        Use per PID buffer (-u/-j only)\n");
+	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-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");
 	fprintf(ofp, "                               (default: %u)\n", DEFAULT_CHANNEL_TRACEFILE_SIZE);
+	fprintf(ofp, "                           Note: traces generated with this option may inaccurately report\n");
+	fprintf(ofp, "                           discarded events as per CTF 1.8.\n");
 	fprintf(ofp, "  -W, --tracefile-count COUNT\n");
 	fprintf(ofp, "                           Used in conjunction with -C option, this will limit the number\n");
 	fprintf(ofp, "                           of files created to the specified count. 0 means unlimited.\n");
@@ -169,7 +171,7 @@ static void set_default_attr(struct lttng_domain *dom)
 	if (chan.attr.read_timer_interval == -1) {
 		chan.attr.read_timer_interval = default_attr.read_timer_interval;
 	}
-	if (chan.attr.output == -1) {
+	if ((int) chan.attr.output == -1) {
 		chan.attr.output = default_attr.output;
 	}
 	if (chan.attr.tracefile_count == -1) {
@@ -392,7 +394,7 @@ int cmd_enable_channels(int argc, const char **argv)
 			order = get_count_order_u64(chan.attr.num_subbuf);
 			assert(order >= 0);
 			rounded_size = 1ULL << order;
-			if (rounded_size < chan.attr.subbuf_size) {
+			if (rounded_size < chan.attr.num_subbuf) {
 				ERR("The number of subbuffers (%" PRIu64 ") is rounded and overflows!",
 						chan.attr.num_subbuf);
 				ret = CMD_ERROR;