X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=36a4fbed99e1b5234e986b3a7c10aa85ef00d54e;hp=02903becdab2ca4783b147d3e060063f1e460855;hb=511ed4e25eeb6821dc4f4b6c573fbbdc07c17053;hpb=9fb6c2dbea6c22a5f047ec90575e0b8a053db393 diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c index 02903becd..36a4fbed9 100644 --- a/src/bin/lttng/lttng.c +++ b/src/bin/lttng/lttng.c @@ -32,6 +32,15 @@ #include #include "command.h" +#include "version.h" + +static const char *help_msg = +#ifdef LTTNG_EMBED_HELP +#include +#else +NULL +#endif +; /* Variables */ static char *progname; @@ -66,8 +75,8 @@ static struct option long_options[] = { /* First level command */ static struct cmd_struct commands[] = { { "add-context", cmd_add_context}, - { "calibrate", cmd_calibrate}, { "create", cmd_create}, + { "clear", cmd_clear}, { "destroy", cmd_destroy}, { "disable-channel", cmd_disable_channels}, { "disable-event", cmd_disable_events}, @@ -77,6 +86,10 @@ static struct cmd_struct commands[] = { { "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}, @@ -85,7 +98,6 @@ static struct cmd_struct commands[] = { { "stop", cmd_stop}, { "track", cmd_track}, { "untrack", cmd_untrack}, - { "help", NULL}, { "version", cmd_version}, { "view", cmd_view}, { NULL, NULL} /* Array closure */ @@ -93,9 +105,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); } /* @@ -242,6 +255,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]"); @@ -251,9 +281,10 @@ 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(" 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(""); @@ -275,12 +306,16 @@ 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); 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); @@ -299,7 +334,6 @@ static void show_basic_help(void) 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]); @@ -318,10 +352,9 @@ static int parse_args(int argc, char **argv) ret = 0; goto end; case 'h': - ret = utils_show_man_page(1, "lttng"); - + ret = utils_show_help(1, "lttng", help_msg); if (ret) { - ERR("Cannot view man page lttng(1)"); + ERR("Cannot show --help for `lttng`"); perror("exec"); } goto end; @@ -348,6 +381,7 @@ static int parse_args(int argc, char **argv) opt_no_sessiond = 1; break; case OPT_SESSION_PATH: + free(opt_sessiond_path); opt_sessiond_path = strdup(optarg); if (!opt_sessiond_path) { ret = -1; @@ -355,6 +389,7 @@ static int parse_args(int argc, char **argv) } break; case OPT_RELAYD_PATH: + free(opt_relayd_path); opt_relayd_path = strdup(optarg); if (!opt_relayd_path) { ret = -1; @@ -386,14 +421,6 @@ static int parse_args(int argc, char **argv) goto error; } - /* For Mathieu Desnoyers a.k.a. Dr. Tracing */ - user = getenv("USER"); - if (user != NULL && ((strncmp(progname, "drtrace", 7) == 0 || - strncmp("compudj", user, 7) == 0))) { - MSG("%c[%d;%dmWelcome back Dr Tracing!%c[%dm\n", 27,1,33,27,0); - } - /* Thanks Mathieu */ - /* * Handle leftovers which is a first level command with the trailing * options. @@ -401,19 +428,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;