Add a save command based on the save API to the lttng client

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

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 5755db6379daa5466cd1542a6709bfb97318e724..c4443e7fb22c8e60d285bcb10dc1952f6e82c1a1 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -39,7 +39,10 @@ static char *opt_sessiond_path;
 static pid_t sessiond_pid;
 static volatile int recv_child_signal;
 
+char *opt_relayd_path;
+
 enum {
+       OPT_RELAYD_PATH,
        OPT_SESSION_PATH,
        OPT_DUMP_OPTIONS,
        OPT_DUMP_COMMANDS,
@@ -54,6 +57,7 @@ static struct option long_options[] = {
        {"quiet",            0, NULL, 'q'},
        {"no-sessiond",      0, NULL, 'n'},
        {"sessiond-path",    1, NULL, OPT_SESSION_PATH},
+       {"relayd-path",      1, NULL, OPT_RELAYD_PATH},
        {"list-options",     0, NULL, OPT_DUMP_OPTIONS},
        {"list-commands",    0, NULL, OPT_DUMP_COMMANDS},
        {NULL, 0, NULL, 0}
@@ -76,6 +80,7 @@ static struct cmd_struct commands[] =  {
        { "calibrate", cmd_calibrate},
        { "view", cmd_view},
        { "snapshot", cmd_snapshot},
+       { "save", cmd_save},
        { "enable-consumer", cmd_enable_consumer}, /* OBSOLETE */
        { "disable-consumer", cmd_disable_consumer}, /* OBSOLETE */
        { NULL, NULL}   /* Array closure */
@@ -96,6 +101,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  -g, --group NAME           Unix tracing group name. (default: tracing)\n");
        fprintf(ofp, "  -n, --no-sessiond          Don't spawn a session daemon\n");
        fprintf(ofp, "      --sessiond-path PATH   Session daemon full path\n");
+       fprintf(ofp, "      --relayd-path PATH     Relayd daemon full path\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Commands:\n");
        fprintf(ofp, "    add-context       Add context to event and/or channel\n");
@@ -113,6 +119,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "    stop              Stop tracing\n");
        fprintf(ofp, "    version           Show version information\n");
        fprintf(ofp, "    view              Start trace viewer\n");
+       fprintf(ofp, "    save              Save session configuration\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Each command also has its own -h, --help option.\n");
        fprintf(ofp, "\n");
@@ -150,25 +157,6 @@ static void list_options(FILE *ofp)
        }
 }
 
-/*
- *  list_commands
- *
- *  List commands line by line. This is mostly for bash auto completion and to
- *  avoid difficult parsing.
- */
-static void list_commands(FILE *ofp)
-{
-       int i = 0;
-       struct cmd_struct *cmd = NULL;
-
-       cmd = &commands[i];
-       while (cmd->name != NULL) {
-               fprintf(ofp, "%s\n", cmd->name);
-               i++;
-               cmd = &commands[i];
-       }
-}
-
 /*
  * clean_exit
  */
@@ -461,12 +449,15 @@ static int parse_args(int argc, char **argv)
                case OPT_SESSION_PATH:
                        opt_sessiond_path = strdup(optarg);
                        break;
+               case OPT_RELAYD_PATH:
+                       opt_relayd_path = strdup(optarg);
+                       break;
                case OPT_DUMP_OPTIONS:
                        list_options(stdout);
                        ret = 0;
                        goto end;
                case OPT_DUMP_COMMANDS:
-                       list_commands(stdout);
+                       list_commands(commands, stdout);
                        ret = 0;
                        goto end;
                default: