Add lttng-modules detection for tests

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

diff --git a/lttng/lttng.c b/lttng/lttng.c
index 0cd5a2874ed6173c513f05646cbbcf8561ccf7f7..4d81d2a1d4d9fe7914cd84bec9132207fed65f0c 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
@@ -71,6 +71,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 +92,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");
@@ -336,8 +338,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;