projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: missing mentions of tracing session rotation in basic help
[lttng-tools.git]
/
src
/
bin
/
lttng
/
lttng.c
diff --git
a/src/bin/lttng/lttng.c
b/src/bin/lttng/lttng.c
index bf2128ca35896dbbc998ecadf125e7eb4774ed6d..aaee5a25d243d4c828d4f82434cd508a8a0e80d0 100644
(file)
--- a/
src/bin/lttng/lttng.c
+++ b/
src/bin/lttng/lttng.c
@@
-32,6
+32,7
@@
#include <common/utils.h>
#include "command.h"
#include <common/utils.h>
#include "command.h"
+#include "version.h"
static const char *help_msg =
#ifdef LTTNG_EMBED_HELP
static const char *help_msg =
#ifdef LTTNG_EMBED_HELP
@@
-85,6
+86,9
@@
static struct cmd_struct commands[] = {
{ "load", cmd_load},
{ "metadata", cmd_metadata},
{ "regenerate", cmd_regenerate},
{ "load", cmd_load},
{ "metadata", cmd_metadata},
{ "regenerate", cmd_regenerate},
+ { "rotate", cmd_rotate},
+ { "enable-rotation", cmd_enable_rotation},
+ { "disable-rotation", cmd_disable_rotation},
{ "save", cmd_save},
{ "set-session", cmd_set_session},
{ "snapshot", cmd_snapshot},
{ "save", cmd_save},
{ "set-session", cmd_set_session},
{ "snapshot", cmd_snapshot},
@@
-249,6
+253,23
@@
end:
return ret;
}
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]");
static void show_basic_help(void)
{
puts("Usage: lttng [--group=GROUP] [--mi=TYPE] [--no-sessiond | --sessiond-path=PATH]");
@@
-282,6
+303,11
@@
static void show_basic_help(void)
puts(" start " CONFIG_CMD_DESCR_START);
puts(" stop " CONFIG_CMD_DESCR_STOP);
puts("");
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);
puts("Resource tracking:");
puts(" track " CONFIG_CMD_DESCR_TRACK);
puts(" untrack " CONFIG_CMD_DESCR_UNTRACK);
@@
-399,19
+425,19
@@
static int parse_args(int argc, char **argv)
ret = handle_command(argc - optind, argv + optind);
switch (ret) {
case CMD_WARNING:
ret = handle_command(argc - optind, argv + optind);
switch (ret) {
case CMD_WARNING:
- WARN("Some command(s) went wrong");
- break;
case CMD_ERROR:
case CMD_ERROR:
- ERR("Command error");
break;
case CMD_UNDEFINED:
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:
break;
case CMD_FATAL:
- ERR("Fatal error");
- break;
case CMD_UNSUPPORTED:
case CMD_UNSUPPORTED:
- ERR("Unsupported command");
break;
case -1:
ret = 1;
break;
case -1:
ret = 1;
This page took
0.0287 seconds
and
4
git commands to generate.