Update version to 2.0-pre17

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

diff --git a/lttng/lttng.c b/lttng/lttng.c
index 0cd5a2874ed6173c513f05646cbbcf8561ccf7f7..69b563d4a643eb80db6718673602ebe67efb9c4b 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
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <config.h>
 
 #include <lttng/lttng.h>
 
@@ -71,6 +72,7 @@ static struct cmd_struct commands[] =  {
        { "add-context", cmd_add_context},
        { "set-session", cmd_set_session},
        { "version", cmd_version},
+       { "calibrate", cmd_calibrate},
        { NULL, NULL}   /* Array closure */
 };
 
@@ -91,6 +93,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "\n");
        fprintf(ofp, "Commands:\n");
        fprintf(ofp, "    add-context     Add context to event or/and channel\n");
+       fprintf(ofp, "    calibrate       Quantify LTTng overhead\n");
        fprintf(ofp, "    create          Create tracing session\n");
        fprintf(ofp, "    destroy         Teardown tracing session\n");
        fprintf(ofp, "    enable-channel  Enable tracing channel\n");
@@ -284,7 +287,7 @@ static int spawn_sessiond(char *pathname)
                 * Spawn session daemon and tell
                 * it to signal us when ready.
                 */
-               execlp(pathname, "ltt-sessiond", "--sig-parent", "--quiet", NULL);
+               execlp(pathname, "lttng-sessiond", "--sig-parent", "--quiet", NULL);
                /* execlp only returns if error happened */
                if (errno == ENOENT) {
                        ERR("No session daemon found. Use --sessiond-path.");
@@ -294,7 +297,7 @@ static int spawn_sessiond(char *pathname)
                kill(getppid(), SIGTERM);       /* unpause parent */
                exit(EXIT_FAILURE);
        } else if (pid > 0) {
-               /* Wait for ltt-sessiond to start */
+               /* Wait for lttng-sessiond to start */
                pause();
                goto end;
        } else {
@@ -336,8 +339,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 "/lttng-sessiond");
                        if (ret < 0) {
+                               perror("asprintf spawn sessiond");
                                goto end;
                        }
                        pathname = alloc_pathname;
@@ -355,6 +359,23 @@ end:
        return ret;
 }
 
+/*
+ * Check for the "help" option in the argv. If found, return 1 else return 0.
+ */
+static int check_help_command(int argc, char **argv)
+{
+       int i;
+
+       for (i = 0; i < argc; i++) {
+               if ((strncmp(argv[i], "-h", 2) == 0) ||
+                               strncmp(argv[i], "--h", 3) == 0) {
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
 /*
  *  parse_args
  *
@@ -376,7 +397,7 @@ static int parse_args(int argc, char **argv)
                        usage(stderr);
                        goto error;
                case 'v':
-                       opt_verbose = 1;
+                       opt_verbose += 1;
                        break;
                case 'q':
                        opt_quiet = 1;
@@ -410,7 +431,8 @@ static int parse_args(int argc, char **argv)
        }
 
        /* Spawn session daemon if needed */
-       if (opt_no_sessiond == 0 && (check_sessiond() < 0)) {
+       if (opt_no_sessiond == 0 && check_help_command(argc, argv) == 0 &&
+                       (check_sessiond() < 0)) {
                goto error;
        }
 
@@ -429,7 +451,7 @@ static int parse_args(int argc, char **argv)
                if (ret == -1) {
                        usage(stderr);
                } else {
-                       ERR("%s", lttng_get_readable_code(ret));
+                       ERR("%s", lttng_strerror(ret));
                }
                goto error;
        }