projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: implement kernel clear session
[lttng-tools.git]
/
src
/
bin
/
lttng
/
lttng.c
diff --git
a/src/bin/lttng/lttng.c
b/src/bin/lttng/lttng.c
index 08eea54a63200f953ce6e0046d80ababc324e8c9..36a4fbed99e1b5234e986b3a7c10aa85ef00d54e 100644
(file)
--- a/
src/bin/lttng/lttng.c
+++ b/
src/bin/lttng/lttng.c
@@
-76,6
+76,7
@@
static struct option long_options[] = {
static struct cmd_struct commands[] = {
{ "add-context", cmd_add_context},
{ "create", cmd_create},
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},
{ "destroy", cmd_destroy},
{ "disable-channel", cmd_disable_channels},
{ "disable-event", cmd_disable_events},
@@
-104,9
+105,10
@@
static struct cmd_struct commands[] = {
static void version(FILE *ofp)
{
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,
progname,
- GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+ GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+ EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
}
/*
}
/*
@@
-253,6
+255,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]");
@@
-262,6
+281,7
@@
static void show_basic_help(void)
puts("");
puts("Tracing sessions:");
puts(" create " CONFIG_CMD_DESCR_CREATE);
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);
puts(" destroy " CONFIG_CMD_DESCR_DESTROY);
puts(" load " CONFIG_CMD_DESCR_LOAD);
puts(" regenerate " CONFIG_CMD_DESCR_REGENERATE);
@@
-286,6
+306,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);
@@
-403,19
+428,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.025196 seconds
and
4
git commands to generate.