Mi: mi backend + mi for command version

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

diff --git a/src/bin/lttng/commands/load.c b/src/bin/lttng/commands/load.c
index 711ac04216383c42ef44e887a8472f6f6022ded6..347e4ca08896b8507a9e0939c281a0046a946bec 100644 (file)
--- a/src/bin/lttng/commands/load.c
+++ b/src/bin/lttng/commands/load.c
@@ -77,6 +77,13 @@ int cmd_load(int argc, const char **argv)
        pc = poptGetContext(NULL, argc, argv, load_opts, 0);
        poptReadDefaultConfig(pc, 0);
 
+       /* TODO: mi support */
+       if (lttng_opt_mi) {
+               ret = -LTTNG_ERR_MI_NOT_IMPLEMENTED;
+               ERR("mi option not supported");
+               goto end;
+       }
+
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
@@ -97,23 +104,26 @@ int cmd_load(int argc, const char **argv)
 
        if (!opt_load_all) {
                session_name = poptGetArg(pc);
-               if (!session_name) {
-                       ERR("A session name must be provided if the \"all\" option is not used.");
-                       ret = CMD_ERROR;
-                       goto end;
+               if (session_name) {
+                       DBG2("Loading session name: %s", session_name);
                }
-               DBG2("Loading session name: %s", session_name);
        }
 
-       ret = config_load_session(opt_input_path, session_name, opt_force);
+       ret = config_load_session(opt_input_path, session_name, opt_force, 0);
        if (ret) {
                ERR("%s", lttng_strerror(ret));
                ret = -ret;
        } else {
                if (opt_load_all) {
                        MSG("All sessions have been loaded successfully");
-               } else {
+               } else if (session_name) {
+                       ret = config_init((char *)session_name);
+                       if (ret < 0) {
+                               ret = CMD_WARNING;
+                       }
                        MSG("Session %s has been loaded successfully", session_name);
+               } else {
+                       MSG("Session has been loaded successfully");
                }
        }
 end: