From 96fe6b8db99e9c71f0dc1260a0f9ea95b50c2c21 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Thu, 22 May 2014 17:32:48 -0400 Subject: [PATCH] Revert "Remove --no-output option from the command line" This reverts commit bb2b749bfdced63e744f660aaab28bc12669b6dc. This affected too many tests that use that option but should not. A better tested commit will replace this one soon. Signed-off-by: David Goulet --- doc/man/lttng.1 | 7 +++++-- src/bin/lttng/commands/create.c | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/man/lttng.1 b/doc/man/lttng.1 index c8933441e..483df2aef 100644 --- a/doc/man/lttng.1 +++ b/doc/man/lttng.1 @@ -252,9 +252,12 @@ Simple listing of options .BR "\-o, \-\-output PATH" Specify output path for traces .TP +.BR "\-\-no-output" +Traces will not be output +.TP .BR "\-\-snapshot" -Set the session in snapshot mode. Created without a consumer and uses the URL, -if one is specified, as the default snapshot output. Every channel will be set +Set the session in snapshot mode. Created in no-output mode and uses the +URL, if one is specified, as the default snapshot output. Every channel will be set in overwrite mode and with mmap output (splice not supported). .TP .BR "\-\-live [USEC]" diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index 3a6886134..e02b14142 100644 --- a/src/bin/lttng/commands/create.c +++ b/src/bin/lttng/commands/create.c @@ -42,6 +42,7 @@ static char *opt_url; static char *opt_ctrl_url; static char *opt_data_url; static int opt_no_consumer; +static int opt_no_output; static int opt_snapshot; static unsigned int opt_live_timer; static int opt_disable_consumer; @@ -60,6 +61,7 @@ static struct poptOption long_options[] = { {"set-url", 'U', POPT_ARG_STRING, &opt_url, 0, 0, 0}, {"ctrl-url", 'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0}, {"data-url", 'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0}, + {"no-output", 0, POPT_ARG_VAL, &opt_no_output, 1, 0, 0}, {"no-consumer", 0, POPT_ARG_VAL, &opt_no_consumer, 1, 0, 0}, {"disable-consumer", 0, POPT_ARG_VAL, &opt_disable_consumer, 1, 0, 0}, {"snapshot", 0, POPT_ARG_VAL, &opt_snapshot, 1, 0, 0}, @@ -87,8 +89,9 @@ static void usage(FILE *ofp) fprintf(ofp, " -h, --help Show this help\n"); fprintf(ofp, " --list-options Simple listing of options\n"); fprintf(ofp, " -o, --output PATH Specify output path for traces\n"); + fprintf(ofp, " --no-output Traces will not be outputted\n"); fprintf(ofp, " --snapshot Set the session in snapshot mode.\n"); - fprintf(ofp, " Created without a consumer and uses the URL,\n"); + fprintf(ofp, " Created in no-output mode and uses the URL,\n"); fprintf(ofp, " if one, as the default snapshot output.\n"); fprintf(ofp, " Every channel will be set in overwrite mode\n"); fprintf(ofp, " and with mmap output (splice not supported).\n"); @@ -343,7 +346,7 @@ static int create_session(void) url = alloc_url; print_str_url = alloc_url + strlen("file://"); } else { - /* No output means --snapshot mode. */ + /* No output means --no-output or --snapshot mode. */ url = NULL; } @@ -513,7 +516,7 @@ int cmd_create(int argc, const char **argv) } if (opt_no_consumer) { - MSG("The option --no-consumer is obsolete."); + MSG("The option --no-consumer is obsolete. Use --no-output now."); ret = CMD_WARNING; goto end; } -- 2.34.1