CLI: Implement lttng clear session command

[lttng-tools.git] / src / bin / lttng / lttng.c

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 08eea54a63200f953ce6e0046d80ababc324e8c9..2d9117a37b02a2989e9aedbd32caa352fb2dba07 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},
+       { "clear", cmd_clear},
        { "destroy", cmd_destroy},
        { "disable-channel", cmd_disable_channels},
        { "disable-event", cmd_disable_events},
@@ -253,6 +254,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]");
@@ -262,6 +280,7 @@ 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("  regenerate        " CONFIG_CMD_DESCR_REGENERATE);
@@ -403,19 +422,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;