projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng rotate command
[lttng-tools.git]
/
src
/
bin
/
lttng
/
lttng.c
diff --git
a/src/bin/lttng/lttng.c
b/src/bin/lttng/lttng.c
index 9317e83dc5873d84a3c107d64ca5d6b9de228f1f..c0f5a05ca7cabba6f181bdd0ed75c0fe60567ac4 100644
(file)
--- a/
src/bin/lttng/lttng.c
+++ b/
src/bin/lttng/lttng.c
@@
-33,6
+33,14
@@
#include "command.h"
#include "command.h"
+static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng.1.h>
+#else
+NULL
+#endif
+;
+
/* Variables */
static char *progname;
int opt_no_sessiond;
/* Variables */
static char *progname;
int opt_no_sessiond;
@@
-66,7
+74,6
@@
static struct option long_options[] = {
/* First level command */
static struct cmd_struct commands[] = {
{ "add-context", cmd_add_context},
/* First level command */
static struct cmd_struct commands[] = {
{ "add-context", cmd_add_context},
- { "calibrate", cmd_calibrate},
{ "create", cmd_create},
{ "destroy", cmd_destroy},
{ "disable-channel", cmd_disable_channels},
{ "create", cmd_create},
{ "destroy", cmd_destroy},
{ "disable-channel", cmd_disable_channels},
@@
-77,6
+84,8
@@
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},
{ "save", cmd_save},
{ "set-session", cmd_set_session},
{ "snapshot", cmd_snapshot},
{ "save", cmd_save},
{ "set-session", cmd_set_session},
{ "snapshot", cmd_snapshot},
@@
-85,10
+94,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 */
};
@@
-254,7
+261,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("");
@@
-281,7
+288,6
@@
static void show_basic_help(void)
puts(" untrack " CONFIG_CMD_DESCR_UNTRACK);
puts("");
puts("Miscellaneous:");
puts(" untrack " CONFIG_CMD_DESCR_UNTRACK);
puts("");
puts("Miscellaneous:");
- puts(" calibrate " CONFIG_CMD_DESCR_CALIBRATE);
puts(" help " CONFIG_CMD_DESCR_HELP);
puts(" version " CONFIG_CMD_DESCR_VERSION);
puts(" view " CONFIG_CMD_DESCR_VIEW);
puts(" help " CONFIG_CMD_DESCR_HELP);
puts(" version " CONFIG_CMD_DESCR_VERSION);
puts(" view " CONFIG_CMD_DESCR_VIEW);
@@
-300,7
+306,6
@@
static void show_basic_help(void)
static int parse_args(int argc, char **argv)
{
int opt, ret;
static int parse_args(int argc, char **argv)
{
int opt, ret;
- char *user;
if (lttng_is_setuid_setgid()) {
ERR("'%s' is not allowed to be executed as a setuid/setgid binary for security reasons. Aborting.", argv[0]);
if (lttng_is_setuid_setgid()) {
ERR("'%s' is not allowed to be executed as a setuid/setgid binary for security reasons. Aborting.", argv[0]);
@@
-319,10
+324,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;
This page took
0.025215 seconds
and
4
git commands to generate.