Fix: Check that lttng create --live's time is not zero

[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 4f97c86489e9934c9f2b3b136d6757dc186ea1c6..ba62940c62fbb4dec65057d9942250d6c7d8fa7a 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <ctype.h>
 #include <popt.h>
@@ -43,6 +44,7 @@ static char *opt_session_name;
 static char *opt_url;
 static char *opt_ctrl_url;
 static char *opt_data_url;
+static char *opt_shm_path;
 static int opt_no_consumer;
 static int opt_no_output;
 static int opt_snapshot;
@@ -68,6 +70,7 @@ static struct poptOption long_options[] = {
        {"no-consumer",     0, POPT_ARG_VAL, &opt_no_consumer, 1, 0, 0},
        {"snapshot",        0, POPT_ARG_VAL, &opt_snapshot, 1, 0, 0},
        {"live",            0, POPT_ARG_INT | POPT_ARGFLAG_OPTIONAL, 0, OPT_LIVE_TIMER, 0, 0},
+       {"shm-path",        0, POPT_ARG_STRING, &opt_shm_path, 0, 0, 0},
        {0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -105,6 +108,9 @@ static void usage(FILE *ofp)
        fprintf(ofp, "                       By default, %u is used for the timer and the\n",
                                                                                        DEFAULT_LTTNG_LIVE_TIMER);
        fprintf(ofp, "                       network URL is set to net://127.0.0.1.\n");
+       fprintf(ofp, "      --shm-path PATH  Path where shared memory holding buffers\n");
+       fprintf(ofp, "                       should be created. Useful when used with pramfs\n");
+       fprintf(ofp, "                       to extract trace data after crash.\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Extended Options:\n");
        fprintf(ofp, "\n");
@@ -296,6 +302,7 @@ static int create_session(void)
        char session_name_date[NAME_MAX + 17], *print_str_url = NULL;
        time_t rawtime;
        struct tm *timeinfo;
+       char shm_path[PATH_MAX] = "";
 
        /* Get date and time for automatic session name/path */
        time(&rawtime);
@@ -376,16 +383,22 @@ static int create_session(void)
                 */
                url = NULL;
        } else if (!opt_no_output) {
+               char *tmp_path;
+
                /* Auto output path */
-               alloc_path = utils_get_home_dir();
-               if (alloc_path == NULL) {
+               tmp_path = utils_get_home_dir();
+               if (tmp_path == NULL) {
                        ERR("HOME path not found.\n \
                                        Please specify an output path using -o, --output PATH");
                        ret = CMD_FATAL;
                        goto error;
                }
-               alloc_path = strdup(alloc_path);
-
+               alloc_path = strdup(tmp_path);
+               if (!alloc_path) {
+                       PERROR("allocating alloc_path");
+                       ret = CMD_FATAL;
+                       goto error;
+               }
                ret = asprintf(&alloc_url,
                                "file://%s/" DEFAULT_TRACE_DIR_NAME "/%s",
                                alloc_path, session_name_date);
@@ -474,6 +487,21 @@ static int create_session(void)
                }
        }
 
+       if (opt_shm_path) {
+               ret = snprintf(shm_path, sizeof(shm_path),
+                               "%s/%s", opt_shm_path, session_name_date);
+               if (ret < 0) {
+                       PERROR("snprintf shm_path");
+                       goto error;
+               }
+
+               ret = lttng_set_session_shm_path(session_name, shm_path);
+               if (ret < 0) {
+                       lttng_destroy_session(session_name);
+                       goto error;
+               }
+       }
+
        MSG("Session %s created.", session_name);
        if (print_str_url && !opt_snapshot) {
                MSG("Traces will be written in %s", print_str_url);
@@ -488,6 +516,10 @@ static int create_session(void)
                MSG("Snapshot mode set. Every channel enabled for that session will "
                                "be set in overwrite mode and mmap output.");
        }
+       if (opt_shm_path) {
+               MSG("Session %s set to shm_path: %s.", session_name,
+                       shm_path);
+       }
 
        /* Mi output */
        if (lttng_opt_mi) {
@@ -565,6 +597,11 @@ int cmd_create(int argc, const char **argv)
                                ret = CMD_ERROR;
                                goto end;
                        }
+                       if (v == 0) {
+                               ERR("Live timer interval must be greater than zero");
+                               ret = CMD_ERROR;
+                               goto end;
+                       }
                        opt_live_timer = (uint32_t) v;
                        DBG("Session live timer interval set to %d", opt_live_timer);
                        break;