Fix: typo in the create command help and man page

[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 dd10ab22767b8718ef232f4c19656e758b79c9bf..fe659d08747394de4d62cd2ea7da8c030513ef26 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -52,15 +52,18 @@ static struct poptOption long_options[] = {
        {"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},
-       {"set-uri",        'U', POPT_ARG_STRING, &opt_url, 0, 0, 0},
-       {"ctrl-uri",       'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
-       {"data-uri",       'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
+       {"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},
        {"disable-consumer", 0, POPT_ARG_VAL, &opt_disable_consumer, 1, 0, 0},
        {0, 0, 0, 0, 0, 0, 0}
 };
 
-/* HACK */
+/*
+ * Please have a look at src/lib/lttng-ctl/lttng-ctl.c for more information on
+ * why this declaration exists and used ONLY in for this command.
+ */
 extern int _lttng_create_session_ext(const char *name, const char *url,
                const char *datetime);
 
@@ -104,12 +107,12 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  > file://...\n");
        fprintf(ofp, "    Local filesystem full path.\n");
        fprintf(ofp, "\n");
-       fprintf(ofp, "  > net[4|6]://...\n");
+       fprintf(ofp, "  > net[6]://...\n");
        fprintf(ofp, "    This will use the default network transport layer which is\n");
        fprintf(ofp, "    TCP for both control (PORT1) and data port (PORT2).\n");
        fprintf(ofp, "    The default ports are respectively 5342 and 5343.\n");
        fprintf(ofp, "\n");
-       fprintf(ofp, "  > tcp[4|6]://...\n");
+       fprintf(ofp, "  > tcp[6]://...\n");
        fprintf(ofp, "    Can only be used with -C and -D together\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "NOTE: IPv6 address MUST be enclosed in brackets '[]' (rfc2732)\n");
@@ -251,7 +254,7 @@ static int create_session(void)
        int ret;
        char *session_name = NULL, *traces_path = NULL, *alloc_path = NULL;
        char *alloc_url = NULL, *url = NULL, datetime[16];
-       char session_name_date[NAME_MAX];
+       char session_name_date[NAME_MAX + 17], *print_str_url = NULL;
        time_t rawtime;
        struct tm *timeinfo;
 
@@ -268,13 +271,23 @@ static int create_session(void)
                        PERROR("snprintf session name");
                        goto error;
                }
-               session_name = strdup(DEFAULT_SESSION_NAME);
-               if (session_name == NULL) {
-                       PERROR("strdup session name");
-                       goto error;
-               }
+               session_name = session_name_date;
                DBG("Auto session name set to %s", session_name_date);
        } else {
+               if (strlen(opt_session_name) > NAME_MAX) {
+                       ERR("Session name too long. Length must be lower or equal to %d",
+                                       NAME_MAX);
+                       ret = LTTNG_ERR_SESSION_FAIL;
+                       goto error;
+               }
+               if (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
+                                       strlen(DEFAULT_SESSION_NAME)) == 0 &&
+                               strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME)) {
+                       ERR("%s is a reserved keyword for default session(s)",
+                                       DEFAULT_SESSION_NAME);
+                       ret = CMD_ERROR;
+                       goto error;
+               }
                session_name = opt_session_name;
                ret = snprintf(session_name_date, sizeof(session_name_date),
                                "%s-%s", session_name, datetime);
@@ -286,6 +299,7 @@ static int create_session(void)
 
        if (opt_no_consumer) {
                url = NULL;
+               print_str_url = "";
        } else if (opt_output_path != NULL) {
                traces_path = utils_expand_path(opt_output_path);
                if (traces_path == NULL) {
@@ -302,10 +316,10 @@ static int create_session(void)
                }
                /* URL to use in the lttng_create_session() call */
                url = alloc_url;
-               MSG("Trace(s) output set to %s", traces_path);
+               print_str_url = traces_path;
        } else if (opt_url) { /* Handling URL (-U opt) */
                url = opt_url;
-               MSG("Trace(s) output set to %s", url);
+               print_str_url = url;
        } else if (opt_ctrl_url == NULL && opt_data_url == NULL) {
                /* Auto output path */
                alloc_path = config_get_default_path();
@@ -327,27 +341,26 @@ static int create_session(void)
                }
 
                url = alloc_url;
-               MSG("Trace(s) output set to %s", alloc_url + strlen("file://"));
+               print_str_url = alloc_url + strlen("file://");
        }
 
        ret = _lttng_create_session_ext(session_name, url, datetime);
        if (ret < 0) {
                /* Don't set ret so lttng can interpret the sessiond error. */
                switch (-ret) {
-               case LTTCOMM_EXIST_SESS:
+               case LTTNG_ERR_EXIST_SESS:
                        WARN("Session %s already exists", session_name);
                        break;
                }
                goto error;
        }
 
-       if (opt_session_name == NULL) {
-               MSG("Session created with default name %s", session_name_date);
-       } else {
-               MSG("Session %s created.", session_name);
+       MSG("Session %s created.", session_name);
+       if (print_str_url) {
+               MSG("Traces will be written in %s", print_str_url);
        }
 
-       if (opt_ctrl_url || opt_data_url) {
+       if (opt_ctrl_url && opt_data_url) {
                /* Setting up control URI (-C or/and -D opt) */
                ret = set_consumer_url(session_name, opt_ctrl_url, opt_data_url);
                if (ret < 0) {
@@ -358,6 +371,11 @@ static int create_session(void)
                if (ret < 0) {
                        goto error;
                }
+       } else if ((!opt_ctrl_url && opt_data_url) ||
+                       (opt_ctrl_url && !opt_data_url)) {
+               ERR("You need both control and data URL.");
+               ret = CMD_ERROR;
+               goto error;
        }
 
        if (opt_disable_consumer && !opt_no_consumer) {
@@ -367,11 +385,6 @@ static int create_session(void)
                }
        }
 
-       if (opt_session_name == NULL) {
-               free(session_name);
-               session_name = session_name_date;
-       }
-
        /* Init lttng session config */
        ret = config_init(session_name);
        if (ret < 0) {
@@ -383,10 +396,6 @@ static int create_session(void)
        ret = CMD_SUCCESS;
 
 error:
-       if (opt_session_name == NULL && session_name != session_name_date) {
-               free(session_name);
-       }
-
        if (alloc_url) {
                free(alloc_url);
        }
@@ -394,6 +403,7 @@ error:
        if (traces_path) {
                free(traces_path);
        }
+       free(alloc_path);
 
        if (ret < 0) {
                ERR("%s", lttng_strerror(ret));