Update version to 2.0-pre3

[lttng-tools.git] / lttng / lttng.c

diff --git a/lttng/lttng.c b/lttng/lttng.c
index 77006bc7f63ab11834bb3b6286e8d69f7af58f55..3e5f1b187f238049bc8c81a01fafbd161083888f 100644 (file)
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -39,7 +39,6 @@ static int opt_no_sessiond;
 static char *opt_sessiond_path;
 
 enum {
-       OPT_NO_SESSIOND,
        OPT_SESSION_PATH,
        OPT_DUMP_OPTIONS,
        OPT_DUMP_COMMANDS,
@@ -51,7 +50,7 @@ static struct option long_options[] = {
        {"group",            1, NULL, 'g'},
        {"verbose",          0, NULL, 'v'},
        {"quiet",            0, NULL, 'q'},
-       {"no-sessiond",      0, NULL, OPT_NO_SESSIOND},
+       {"no-sessiond",      0, NULL, 'n'},
        {"sessiond-path",    1, NULL, OPT_SESSION_PATH},
        {"list-options",     0, NULL, OPT_DUMP_OPTIONS},
        {"list-commands",    0, NULL, OPT_DUMP_COMMANDS},
@@ -63,7 +62,6 @@ static struct cmd_struct commands[] =  {
        { "list", cmd_list},
        { "create", cmd_create},
        { "destroy", cmd_destroy},
-       { "add-channel", cmd_add_channel},
        { "start", cmd_start},
        { "stop", cmd_stop},
        { "enable-event", cmd_enable_events},
@@ -86,13 +84,12 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  -g, --group NAME       Unix tracing group name. (default: tracing)\n");
        fprintf(ofp, "  -v, --verbose          Verbose mode\n");
        fprintf(ofp, "  -q, --quiet            Quiet mode\n");
-       fprintf(ofp, "      --no-sessiond      Don't spawn a session daemon\n");
+       fprintf(ofp, "  -n, --no-sessiond      Don't spawn a session daemon\n");
        fprintf(ofp, "      --sessiond-path    Session daemon full path\n");
        fprintf(ofp, "      --list-options     Simple listing of lttng options\n");
        fprintf(ofp, "      --list-commands    Simple listing of lttng commands\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Commands:\n");
-       fprintf(ofp, "    add-channel     Add channel to tracer\n");
        fprintf(ofp, "    add-context     Add context to event or/and channel\n");
        fprintf(ofp, "    create          Create tracing session\n");
        fprintf(ofp, "    destroy         Teardown tracing session\n");
@@ -339,8 +336,9 @@ static int check_sessiond(void)
 
                /* Let's rock and roll */
                if (pathname == NULL) {
-                       ret = asprintf(&alloc_pathname, "ltt-sessiond");
+                       ret = asprintf(&alloc_pathname, INSTALL_BIN_PATH "/ltt-sessiond");
                        if (ret < 0) {
+                               perror("asprintf spawn sessiond");
                                goto end;
                        }
                        pathname = alloc_pathname;
@@ -373,7 +371,7 @@ static int parse_args(int argc, char **argv)
                clean_exit(EXIT_FAILURE);
        }
 
-       while ((opt = getopt_long(argc, argv, "+hvqg:", long_options, NULL)) != -1) {
+       while ((opt = getopt_long(argc, argv, "+hnvqg:", long_options, NULL)) != -1) {
                switch (opt) {
                case 'h':
                        usage(stderr);
@@ -387,7 +385,7 @@ static int parse_args(int argc, char **argv)
                case 'g':
                        lttng_set_tracing_group(optarg);
                        break;
-               case OPT_NO_SESSIOND:
+               case 'n':
                        opt_no_sessiond = 1;
                        break;
                case OPT_SESSION_PATH: