X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=18574775b1c4843188530d885997424d415cc430;hb=a79d84dd6bf849361c34616ae9f60786c6a6bf20;hp=a5b15fae7f46e7b93856aa46545c73b872124244;hpb=241aaca956f25a6604eac5c13cf14ddea42c2174;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index a5b15fae7..18574775b 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}
 };
 
@@ -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;