X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_channels.c;h=ba5b7b45a5219370a9fd86aa9e9dc4d966145702;hb=35346445460dfe7ba5bbcfdbe279c07c1ee3219b;hp=e49559e4f416cb390c26549397f78449ab4c5886;hpb=cd80958d00fddabced5fbd60641978516a01e29e;p=lttng-tools.git

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index e49559e4f..ba5b7b45a 100644
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -84,12 +84,22 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "  -p, --pid PID            If -u, apply on a specific PID\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Channel options:\n");
-	fprintf(ofp, "      --discard            Discard event when buffers are full (default)\n");
-	fprintf(ofp, "      --overwrite          Flight recorder mode\n");
-	fprintf(ofp, "      --subbuf-size        Subbuffer size in bytes (default: 4096)\n");
-	fprintf(ofp, "      --num-subbuf         Number of subbufers (default: 2)\n");
-	fprintf(ofp, "      --switch-timer       Switch timer interval in usec (default: 0)\n");
-	fprintf(ofp, "      --read-timer         Read timer interval in usec (default: 200)\n");
+	fprintf(ofp, "      --discard            Discard event when buffers are full%s\n",
+		DEFAULT_CHANNEL_OVERWRITE ? "" : " (default)");
+	fprintf(ofp, "      --overwrite          Flight recorder mode%s\n",
+		DEFAULT_CHANNEL_OVERWRITE ? " (default)" : "");
+	fprintf(ofp, "      --subbuf-size        Subbuffer size in bytes\n");
+	fprintf(ofp, "                               (default: %u, kernel default: %u)\n",
+		DEFAULT_CHANNEL_SUBBUF_SIZE,
+		DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE);
+	fprintf(ofp, "      --num-subbuf         Number of subbufers\n");
+	fprintf(ofp, "                               (default: %u, kernel default: %u)\n",
+		DEFAULT_CHANNEL_SUBBUF_NUM,
+		DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM);
+	fprintf(ofp, "      --switch-timer       Switch timer interval in usec (default: %u)\n",
+		DEFAULT_CHANNEL_SWITCH_TIMER);
+	fprintf(ofp, "      --read-timer         Read timer interval in usec (default: %u)\n",
+		DEFAULT_CHANNEL_READ_TIMER);
 	fprintf(ofp, "\n");
 }
 
@@ -162,12 +172,25 @@ error:
  */
 static void init_channel_config(void)
 {
-	chan.attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
-	chan.attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE;
-	chan.attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM;
-	chan.attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
-	chan.attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
-	chan.attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
+	if (opt_kernel) {
+		/* kernel default */
+		chan.attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
+		chan.attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
+		chan.attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+
+		chan.attr.subbuf_size = DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE;
+		chan.attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
+		chan.attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
+	} else {
+		/* default behavior, used by UST. */
+		chan.attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
+		chan.attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
+		chan.attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+
+		chan.attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE;
+		chan.attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM;
+		chan.attr.output = DEFAULT_CHANNEL_OUTPUT;
+	}
 }
 
 /*