X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=d9a3b022d58f5c9dcea878c230ff60680dd235fc;hb=45893984238b2e2c12fc0d84b90336c98a6d98c9;hp=a5b15fae7f46e7b93856aa46545c73b872124244;hpb=f73fabfda365d22e7dd180fb1614e37c446fbd9e;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index a5b15fae7..d9a3b022d 100644
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -34,6 +34,7 @@ static int opt_kernel;
 static char *opt_session_name;
 static int opt_userspace;
 static struct lttng_channel chan;
+static char *opt_output;
 #if 0
 /* Not implemented yet */
 static char *opt_cmd_name;
@@ -54,6 +55,9 @@ enum {
 
 static struct lttng_handle *handle;
 
+const char *output_mmap = "mmap";
+const char *output_splice = "splice";
+
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
@@ -73,6 +77,7 @@ static struct poptOption long_options[] = {
 	{"switch-timer",   0,   POPT_ARG_INT, 0, OPT_SWITCH_TIMER, 0, 0},
 	{"read-timer",     0,   POPT_ARG_INT, 0, OPT_READ_TIMER, 0, 0},
 	{"list-options",   0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
+	{"output",         0,   POPT_ARG_STRING, &opt_output, 0, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -96,9 +101,9 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "      --overwrite          Flight recorder mode%s\n",
 		DEFAULT_CHANNEL_OVERWRITE ? " (default)" : "");
 	fprintf(ofp, "      --subbuf-size 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, "                               (default: %zu, kernel default: %zu)\n",
+		default_get_channel_subbuf_size(),
+		default_get_kernel_channel_subbuf_size());
 	fprintf(ofp, "                               Needs to be a power of 2 for\n");
         fprintf(ofp, "                               kernel and ust tracers\n");
 	fprintf(ofp, "      --num-subbuf NUM     Number of subbufers\n");
@@ -110,6 +115,8 @@ static void usage(FILE *ofp)
 		DEFAULT_CHANNEL_SWITCH_TIMER);
 	fprintf(ofp, "      --read-timer USEC    Read timer interval in usec (default: %u)\n",
 		DEFAULT_CHANNEL_READ_TIMER);
+	fprintf(ofp, "      --output TYPE        Channel output type (Values: %s, %s)\n",
+			output_mmap, output_splice);
 	fprintf(ofp, "\n");
 }
 
@@ -168,6 +175,21 @@ static int enable_channel(char *session_name)
 
 	set_default_attr(&dom);
 
+	/* Setting channel output */
+	if (opt_output) {
+		if (!strncmp(output_mmap, opt_output, strlen(output_mmap))) {
+			chan.attr.output = LTTNG_EVENT_MMAP;
+		} else if (!strncmp(output_splice, opt_output, strlen(output_splice))) {
+			chan.attr.output = LTTNG_EVENT_SPLICE;
+		} else {
+			ERR("Unknown output type %s. Possible values are: %s, %s\n",
+					opt_output, output_mmap, output_splice);
+			usage(stderr);
+			ret = CMD_ERROR;
+			goto error;
+		}
+	}
+
 	handle = lttng_create_handle(session_name, &dom);
 	if (handle == NULL) {
 		ret = -1;