Support flight recorder mode for a session

[lttng-tools.git] / src / bin / lttng / commands / create.c

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 02aaf40f487d471645e12d05d5e224916d68cfa2..72702d5a54743a1d91a652ebb6707ff428f156bd 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -40,6 +40,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_disable_consumer;
 
 enum {
@@ -55,7 +56,8 @@ 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-consumer",      0, POPT_ARG_VAL, &opt_no_consumer, 1, 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},
        {0, 0, 0, 0, 0, 0, 0}
 };
@@ -80,6 +82,7 @@ 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 outputed\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Extended Options:\n");
        fprintf(ofp, "\n");
@@ -91,11 +94,6 @@ static void usage(FILE *ofp)
        fprintf(ofp, "                       You can change it with the enable-consumer cmd\n");
        fprintf(ofp, "  -C, --ctrl-url=URL   Set control path URL. (Must use -D also)\n");
        fprintf(ofp, "  -D, --data-url=URL   Set data path URL. (Must use -C also)\n");
-       fprintf(ofp, "      --no-consumer    Don't activate a consumer for this session.\n");
-       fprintf(ofp, "                       OBSELETE\n");
-       fprintf(ofp, "      --disable-consumer\n");
-       fprintf(ofp, "                       Disable consumer for this session.\n");
-       fprintf(ofp, "                       OBSELETE\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Please refer to the man page (lttng(1)) for more information on network\n");
        fprintf(ofp, "streaming mechanisms and explanation of the control and data port\n");
@@ -253,9 +251,9 @@ static int create_session(void)
        } else if (opt_url) { /* Handling URL (-U opt) */
                url = opt_url;
                print_str_url = url;
-       } else {
+       } else if (!opt_no_output) {
                /* Auto output path */
-               alloc_path = config_get_default_path();
+               alloc_path = utils_get_home_dir();
                if (alloc_path == NULL) {
                        ERR("HOME path not found.\n \
                                        Please specify an output path using -o, --output PATH");
@@ -277,6 +275,9 @@ static int create_session(void)
                if (!opt_data_url && !opt_ctrl_url) {
                        print_str_url = alloc_url + strlen("file://");
                }
+       } else {
+               /* No output means --no-output. */
+               url = NULL;
        }
 
        if ((!opt_ctrl_url && opt_data_url) || (opt_ctrl_url && !opt_data_url)) {
@@ -293,7 +294,6 @@ static int create_session(void)
                        WARN("Session %s already exists", session_name);
                        break;
                default:
-                       ERR("%s", lttng_strerror(ret));
                        break;
                }
                goto error;
@@ -363,7 +363,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;
        }