Improve error handling of lttng cli

[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 4083e4195633a609ceba1ee2c28eb55d3bedff2d..f60fe619e223e0db9c5686f0a62a5c73362bd02d 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -26,8 +26,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "../cmd.h"
-#include "../conf.h"
+#include "../command.h"
 #include "../utils.h"
 
 static char *opt_output_path;
@@ -35,12 +34,14 @@ static char *opt_session_name;
 
 enum {
        OPT_HELP = 1,
+       OPT_LIST_OPTIONS,
 };
 
 static struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-       {"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-       {"output",    'o', POPT_ARG_STRING, &opt_output_path, 0, 0, 0},
+       {"help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL},
+       {"output", 'o', POPT_ARG_STRING, &opt_output_path, 0, NULL, NULL},
+       {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
        {0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -51,20 +52,22 @@ static void usage(FILE *ofp)
 {
        fprintf(ofp, "usage: lttng create [options] [NAME]\n");
        fprintf(ofp, "\n");
+       fprintf(ofp, "  The default NAME is 'auto-yyyymmdd-hhmmss'\n");
        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, "\n");
 }
 
 /*
- *  create_session
+ *  Create a tracing session.
+ *  If no name is specified, a default name is generated.
  *
- *  Create a tracing session. If no name specified, a default name will be
- *  generated.
+ *  Returns one of the CMD_* result constants.
  */
 static int create_session()
 {
-       int ret, have_name = 0;
+       int ret;
        char datetime[16];
        char *session_name, *traces_path = NULL, *alloc_path = NULL;
        time_t rawtime;
@@ -77,37 +80,32 @@ static int create_session()
 
        /* Auto session name creation */
        if (opt_session_name == NULL) {
-               ret = asprintf(&session_name, "auto-%s", datetime);
+               ret = asprintf(&session_name, "auto");
                if (ret < 0) {
                        perror("asprintf session name");
+                       ret = CMD_ERROR;
                        goto error;
                }
                DBG("Auto session name set to %s", session_name);
        } else {
                session_name = opt_session_name;
-               have_name = 1;
        }
 
        /* Auto output path */
        if (opt_output_path == NULL) {
                alloc_path = strdup(config_get_default_path());
                if (alloc_path == NULL) {
-                       ERR("Home path not found.\n \
-                                Please specify an output path using -o, --output PATH");
+                       ERR("Home path not found.\n"
+                               "Please specify an output path using -o, --output PATH\n");
                        ret = CMD_FATAL;
                        goto error;
                }
 
-               if (have_name) {
-                       ret = asprintf(&traces_path, "%s/" LTTNG_DEFAULT_TRACE_DIR_NAME
-                                       "/%s-%s", alloc_path, session_name, datetime);
-               } else {
-                       ret = asprintf(&traces_path, "%s/" LTTNG_DEFAULT_TRACE_DIR_NAME
-                                       "/%s", alloc_path, session_name);
-               }
-
+               ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME "/%s-%s",
+                               alloc_path, session_name, datetime);
                if (ret < 0) {
                        perror("asprintf trace dir name");
+                       ret = CMD_ERROR;
                        goto error;
                }
        } else {
@@ -116,15 +114,14 @@ static int create_session()
 
        ret = lttng_create_session(session_name, traces_path);
        if (ret < 0) {
+               /* Don't set ret so lttng can interpret the sessiond error. */
                goto error;
        }
 
        /* Init lttng session config */
        ret = config_init(session_name);
        if (ret < 0) {
-               if (ret == -1) {
-                       ret = CMD_ERROR;
-               }
+               ret = CMD_ERROR;
                goto error;
        }
 
@@ -134,6 +131,10 @@ static int create_session()
        ret = CMD_SUCCESS;
 
 error:
+       if (opt_session_name == NULL) {
+               free(session_name);
+       }
+
        if (alloc_path) {
                free(alloc_path);
        }
@@ -145,9 +146,9 @@ error:
 }
 
 /*
- *  cmd_list
+ *  The 'create <options>' first level command
  *
- *  The 'list <options>' first level command
+ *  Returns one of the CMD_* result constants.
  */
 int cmd_create(int argc, const char **argv)
 {
@@ -160,7 +161,10 @@ int cmd_create(int argc, const char **argv)
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
-                       usage(stderr);
+                       usage(stdout);
+                       goto end;
+               case OPT_LIST_OPTIONS:
+                       list_cmd_options(stdout, long_options);
                        goto end;
                default:
                        usage(stderr);
@@ -174,5 +178,6 @@ int cmd_create(int argc, const char **argv)
        ret = create_session();
 
 end:
+       poptFreeContext(pc);
        return ret;
 }