Add lttng-error.h containing every API err. code

[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..96bb184a7bd63a7c654604326ef50e13a23e3f3b 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -60,7 +60,10 @@ static struct poptOption long_options[] = {
        {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,7 +107,7 @@ 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");
@@ -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], *print_str_url = NULL;
        time_t rawtime;
        struct tm *timeinfo;
 
@@ -286,6 +289,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 +306,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,14 +331,14 @@ 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;
                }
@@ -342,10 +346,11 @@ static int create_session(void)
        }
 
        if (opt_session_name == NULL) {
-               MSG("Session created with default name %s", session_name_date);
+               MSG("Session %s created.", session_name_date);
        } else {
                MSG("Session %s created.", session_name);
        }
+       MSG("Traces will be written in %s", print_str_url);
 
        if (opt_ctrl_url || opt_data_url) {
                /* Setting up control URI (-C or/and -D opt) */