X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=4907a43ba19595cc1b90906a59e2012088007cf8;hp=08eea54a63200f953ce6e0046d80ababc324e8c9;hb=ce0b1d61919f37517a6212f7af2afe0fa1b1dcb0;hpb=979d476d33cfaf3b0a19b802f5f64d5c2649f1d7

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 08eea54a6..4907a43ba 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -43,7 +33,7 @@ NULL
 ;
 
 /* Variables */
-static char *progname;
+static const char *progname;
 int opt_no_sessiond;
 char *opt_sessiond_path;
 
@@ -76,6 +66,7 @@ static struct option long_options[] = {
 static struct cmd_struct commands[] =  {
 	{ "add-context", cmd_add_context},
 	{ "create", cmd_create},
+	{ "clear", cmd_clear},
 	{ "destroy", cmd_destroy},
 	{ "disable-channel", cmd_disable_channels},
 	{ "disable-event", cmd_disable_events},
@@ -104,9 +95,10 @@ static struct cmd_struct commands[] =  {
 
 static void version(FILE *ofp)
 {
-	fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s\n",
+	fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s%s\n",
 			progname,
-			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+			EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
 }
 
 /*
@@ -253,6 +245,23 @@ end:
 	return ret;
 }
 
+static bool command_exists(const char *command)
+{
+	const struct cmd_struct *cmd = commands;
+	bool exists = false;
+
+	while (cmd->name != NULL) {
+		if (!strcmp(command, cmd->name)) {
+			exists = true;
+			goto end;
+		}
+		cmd++;
+	}
+
+end:
+	return exists;
+}
+
 static void show_basic_help(void)
 {
 	puts("Usage: lttng [--group=GROUP] [--mi=TYPE] [--no-sessiond | --sessiond-path=PATH]");
@@ -262,6 +271,7 @@ static void show_basic_help(void)
 	puts("");
 	puts("Tracing sessions:");
 	puts("  create            " CONFIG_CMD_DESCR_CREATE);
+	puts("  clear             " CONFIG_CMD_DESCR_CLEAR);
 	puts("  destroy           " CONFIG_CMD_DESCR_DESTROY);
 	puts("  load              " CONFIG_CMD_DESCR_LOAD);
 	puts("  regenerate        " CONFIG_CMD_DESCR_REGENERATE);
@@ -286,6 +296,11 @@ static void show_basic_help(void)
 	puts("  start             " CONFIG_CMD_DESCR_START);
 	puts("  stop              " CONFIG_CMD_DESCR_STOP);
 	puts("");
+	puts("Tracing session rotation:");
+	puts("  disable-rotation  " CONFIG_CMD_DESCR_DISABLE_ROTATION);
+	puts("  enable-rotation   " CONFIG_CMD_DESCR_ENABLE_ROTATION);
+	puts("  rotate            " CONFIG_CMD_DESCR_ROTATE);
+	puts("");
 	puts("Resource tracking:");
 	puts("  track             " CONFIG_CMD_DESCR_TRACK);
 	puts("  untrack           " CONFIG_CMD_DESCR_UNTRACK);
@@ -403,19 +418,19 @@ static int parse_args(int argc, char **argv)
 	ret = handle_command(argc - optind, argv + optind);
 	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 or invalid arguments");
+		if (!command_exists(*(argv + optind))) {
+			MSG("lttng: %s is not an lttng command. See 'lttng --help'.",
+					*(argv + optind));
+		} else {
+			ERR("Unrecognized argument used with \'%s\' command",
+					*(argv + optind));
+		}
 		break;
 	case CMD_FATAL:
-		ERR("Fatal error");
-		break;
 	case CMD_UNSUPPORTED:
-		ERR("Unsupported command");
 		break;
 	case -1:
 		ret = 1;