X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Flttng.c;h=d0f23579d4af38db63ba9ec2e9f76aaa7155b299;hp=379cbb1fdbb6183377bb4e50664d0c84bdb2a1e8;hb=3a009adbd8bf5305668e7e41e5e9f12813d04959;hpb=8490ae7b70872d03eda98f1fb2c76488a47e3084

diff --git a/lttng/lttng.c b/lttng/lttng.c
index 379cbb1fd..d0f23579d 100644
--- 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>
 
@@ -62,7 +63,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},
@@ -72,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,8 +92,8 @@ static void usage(FILE *ofp)
 	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, "    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");
@@ -286,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.");
@@ -296,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 {
@@ -338,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;
@@ -378,7 +380,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;
@@ -431,7 +433,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;
 	}