projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the dynamic buffer to serialize notification objects
[lttng-tools.git]
/
src
/
bin
/
lttng
/
lttng.c
diff --git
a/src/bin/lttng/lttng.c
b/src/bin/lttng/lttng.c
index 1aa15300132592e97756a091ca410a3d49a556e5..8842a03b51e0dd1a602b716c40eb2494d8b77836 100644
(file)
--- a/
src/bin/lttng/lttng.c
+++ b/
src/bin/lttng/lttng.c
@@
-32,6
+32,15
@@
#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
+#include <lttng.1.h>
+#else
+NULL
+#endif
+;
/* Variables */
static char *progname;
/* Variables */
static char *progname;
@@
-76,6
+85,10
@@
static struct cmd_struct commands[] = {
{ "list", cmd_list},
{ "load", cmd_load},
{ "metadata", cmd_metadata},
{ "list", cmd_list},
{ "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},
@@
-84,10
+97,8
@@
static struct cmd_struct commands[] = {
{ "stop", cmd_stop},
{ "track", cmd_track},
{ "untrack", cmd_untrack},
{ "stop", cmd_stop},
{ "track", cmd_track},
{ "untrack", cmd_untrack},
- { "help", NULL},
{ "version", cmd_version},
{ "view", cmd_view},
{ "version", cmd_version},
{ "view", cmd_view},
- { "regenerate", cmd_regenerate},
{ NULL, NULL} /* Array closure */
};
{ NULL, NULL} /* Array closure */
};
@@
-242,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]");
@@
-253,7
+281,7
@@
static void show_basic_help(void)
puts(" create " CONFIG_CMD_DESCR_CREATE);
puts(" destroy " CONFIG_CMD_DESCR_DESTROY);
puts(" load " CONFIG_CMD_DESCR_LOAD);
puts(" create " CONFIG_CMD_DESCR_CREATE);
puts(" destroy " CONFIG_CMD_DESCR_DESTROY);
puts(" load " CONFIG_CMD_DESCR_LOAD);
- puts("
metadata " CONFIG_CMD_DESCR_METADATA
);
+ puts("
regenerate " CONFIG_CMD_DESCR_REGENERATE
);
puts(" save " CONFIG_CMD_DESCR_SAVE);
puts(" set-session " CONFIG_CMD_DESCR_SET_SESSION);
puts("");
puts(" save " CONFIG_CMD_DESCR_SAVE);
puts(" set-session " CONFIG_CMD_DESCR_SET_SESSION);
puts("");
@@
-316,10
+344,9
@@
static int parse_args(int argc, char **argv)
ret = 0;
goto end;
case 'h':
ret = 0;
goto end;
case 'h':
- ret = utils_show_man_page(1, "lttng");
-
+ ret = utils_show_help(1, "lttng", help_msg);
if (ret) {
if (ret) {
- ERR("Cannot
view man page lttng(1)
");
+ ERR("Cannot
show --help for `lttng`
");
perror("exec");
}
goto end;
perror("exec");
}
goto end;
@@
-393,19
+420,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.030546 seconds
and
5
git commands to generate.