X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=10b5d191e84dc068a0ed713760990ac4e798ce27;hb=97e190465f6a2a7d5bf72f445bb4d9d8544a0916;hp=71bc1bf7706f57804833f9de90982ce0a4d0f7e0;hpb=4747a49b20089e4ac15d02a5191bd6cca8567e2f;p=lttng-tools.git

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 71bc1bf77..10b5d191e 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -26,6 +26,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <config.h>
+#include <ctype.h>
 
 #include <lttng/lttng.h>
 #include <common/error.h>
@@ -34,9 +35,6 @@
 
 /* Variables */
 static char *progname;
-
-int opt_quiet;
-int opt_verbose;
 static int opt_no_sessiond;
 static char *opt_sessiond_path;
 static pid_t sessiond_pid;
@@ -76,6 +74,7 @@ static struct cmd_struct commands[] =  {
 	{ "set-session", cmd_set_session},
 	{ "version", cmd_version},
 	{ "calibrate", cmd_calibrate},
+	{ "view", cmd_view},
 	{ NULL, NULL}	/* Array closure */
 };
 
@@ -108,6 +107,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "    start           Start tracing\n");
 	fprintf(ofp, "    stop            Stop tracing\n");
 	fprintf(ofp, "    version         Show version information\n");
+	fprintf(ofp, "    view            Start trace viewer\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Each command also has its own -h, --help option.\n");
 	fprintf(ofp, "\n");
@@ -264,20 +264,6 @@ static int handle_command(int argc, char **argv)
 		/* Find command */
 		if (strcmp(argv[0], cmd->name) == 0) {
 			ret = cmd->func(argc, (const char**) argv);
-			switch (ret) {
-			case CMD_WARNING:
-				WARN("Some command(s) went wrong");
-				break;
-			case CMD_ERROR:
-				ERR("Command error");
-				break;
-			case CMD_UNDEFINED:
-				ERR("Undefined command");
-				break;
-			case CMD_FATAL:
-				ERR("Fatal error");
-				break;
-			}
 			goto end;
 		}
 		i++;
@@ -413,7 +399,8 @@ static int check_args_no_sessiond(int argc, char **argv)
 				strncmp(argv[i], "--h", sizeof("--h")) == 0 ||
 				strncmp(argv[i], "--list-options", sizeof("--list-options")) == 0 ||
 				strncmp(argv[i], "--list-commands", sizeof("--list-commands")) == 0 ||
-				strncmp(argv[i], "version", sizeof("version"))) {
+				strncmp(argv[i], "version", sizeof("version")) == 0 ||
+				strncmp(argv[i], "view", sizeof("view")) == 0) {
 			return 1;
 		}
 	}
@@ -439,12 +426,13 @@ static int parse_args(int argc, char **argv)
 		switch (opt) {
 		case 'h':
 			usage(stdout);
+			ret = 0;
 			goto end;
 		case 'v':
-			opt_verbose += 1;
+			lttng_opt_verbose += 1;
 			break;
 		case 'q':
-			opt_quiet = 1;
+			lttng_opt_quiet = 1;
 			break;
 		case 'g':
 			lttng_set_tracing_group(optarg);
@@ -465,24 +453,27 @@ static int parse_args(int argc, char **argv)
 			goto end;
 		default:
 			usage(stderr);
+			ret = 1;
 			goto error;
 		}
 	}
 
 	/* If both options are specified, quiet wins */
-	if (opt_verbose && opt_quiet) {
-		opt_verbose = 0;
+	if (lttng_opt_verbose && lttng_opt_quiet) {
+		lttng_opt_verbose = 0;
 	}
 
 	/* Spawn session daemon if needed */
 	if (opt_no_sessiond == 0 && check_args_no_sessiond(argc, argv) == 0 &&
 			(check_sessiond() < 0)) {
+		ret = 1;
 		goto error;
 	}
 
 	/* No leftovers, print usage and quit */
 	if ((argc - optind) == 0) {
 		usage(stderr);
+		ret = 1;
 		goto error;
 	}
 
@@ -491,20 +482,33 @@ static int parse_args(int argc, char **argv)
 	 * options.
 	 */
 	ret = handle_command(argc - optind, argv + optind);
-	if (ret < 0) {
-		if (ret == -1) {
-			usage(stderr);
-		} else {
-			ERR("%s", lttng_strerror(ret));
-		}
-		goto error;
+	switch (ret) {
+	case CMD_WARNING:
+		WARN("Some command(s) went wrong");
+		break;
+	case CMD_ERROR:
+		ERR("Command error");
+		break;
+	case CMD_UNDEFINED:
+		ERR("Undefined command");
+		break;
+	case CMD_FATAL:
+		ERR("Fatal error");
+		break;
+	case -1:
+		usage(stderr);
+		ret = 1;
+		break;
+	case 0:
+		break;
+	default:
+		ERR("%s", lttng_strerror(ret));
+		break;
 	}
 
 end:
-	return 0;
-
 error:
-	return -1;
+	return ret;
 }
 
 
@@ -529,8 +533,8 @@ int main(int argc, char *argv[])
 	}
 
 	ret = parse_args(argc, argv);
-	if (ret < 0) {
-		clean_exit(EXIT_FAILURE);
+	if (ret != 0) {
+		clean_exit(ret);
 	}
 
 	return 0;