Merge branch 'master' of git://git.lttng.org/lttng-tools

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index f60fe619e223e0db9c5686f0a62a5c73362bd02d..8052826a245296b0d2d9c310165385a11c5f6ad9 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -67,7 +67,7 @@ static void usage(FILE *ofp)
  */
 static int create_session()
 {
-       int ret;
+       int ret, have_name = 0;
        char datetime[16];
        char *session_name, *traces_path = NULL, *alloc_path = NULL;
        time_t rawtime;
@@ -80,32 +80,37 @@ static int create_session()
 
        /* Auto session name creation */
        if (opt_session_name == NULL) {
-               ret = asprintf(&session_name, "auto");
+               ret = asprintf(&session_name, "auto-%s", datetime);
                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\n");
+                       ERR("Home path not found.\n \
+                                Please specify an output path using -o, --output PATH");
                        ret = CMD_FATAL;
                        goto error;
                }
 
-               ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME "/%s-%s",
-                               alloc_path, session_name, datetime);
+               if (have_name) {
+                       ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
+                                       "/%s-%s", alloc_path, session_name, datetime);
+               } else {
+                       ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
+                                       "/%s", alloc_path, session_name);
+               }
+
                if (ret < 0) {
                        perror("asprintf trace dir name");
-                       ret = CMD_ERROR;
                        goto error;
                }
        } else {

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index f915a16855f2dccbe2d924344febf77f74bda747..3bac86ecdcd93220653c4119111dc542527d4a49 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -602,21 +602,18 @@ int cmd_list(int argc, const char **argv)
                if (!opt_kernel && !opt_userspace) {
                        ret = list_sessions(NULL);
                        if (ret < 0) {
-                               ret = CMD_ERROR;
                                goto end;
                        }
                }
                if (opt_kernel) {
                        ret = list_kernel_events();
                        if (ret < 0) {
-                               ret = CMD_ERROR;
                                goto end;
                        }
                }
                if (opt_userspace) {
                        ret = list_ust_events();
                        if (ret < 0) {
-                               ret = CMD_ERROR;
                                goto end;
                        }
                }
@@ -624,16 +621,12 @@ int cmd_list(int argc, const char **argv)
                /* List session attributes */
                ret = list_sessions(session_name);
                if (ret < 0) {
-                       ret = CMD_ERROR;
                        goto end;
                }
 
                /* Domain listing */
                if (opt_domain) {
                        ret = list_domains(session_name);
-                       if (ret < 0) {
-                               ret = CMD_ERROR;
-                       }
                        goto end;
                }
 
@@ -641,14 +634,13 @@ int cmd_list(int argc, const char **argv)
                        /* Channel listing */
                        ret = list_channels(opt_channel);
                        if (ret < 0) {
-                               ret = CMD_ERROR;
                                goto end;
                        }
                } else {
                        /* We want all domain(s) */
                        nb_domain = lttng_list_domains(session_name, &domains);
                        if (nb_domain < 0) {
-                               ret = CMD_ERROR;
+                               ret = nb_domain;
                                goto end;
                        }
 
@@ -676,7 +668,6 @@ int cmd_list(int argc, const char **argv)
 
                                ret = list_channels(opt_channel);
                                if (ret < 0) {
-                                       ret = CMD_ERROR;
                                        goto end;
                                }
                        }

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 48658a42ddfb9d9e5f2a7ddd820f258bcd0914ac..f84ba63d7e8de48e4a9b6f44c79bbeffa72a7a89 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -399,7 +399,7 @@ static int check_args_no_sessiond(int argc, char **argv)
                                strncmp(argv[i], "--h", sizeof("--h")) == 0 ||
                                strncmp(argv[i], "--list-options", sizeof("--list-options")) == 0 ||
                                strncmp(argv[i], "--list-commands", sizeof("--list-commands")) == 0 ||
-                               strncmp(argv[i], "version", sizeof("version"))) {
+                               strncmp(argv[i], "version", sizeof("version")) == 0) {
                        return 1;
                }
        }