Mi create command: support and validation

Signed-off-by: Jonathan Rajotte Julien <jonathan.r.julien@gmail.com>

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index c43ce59b906c7a5f43db8e5fed1f709262951ac6..1d02a1f0a86021d50c3ad53e5581181b96bc3563 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -27,6 +27,8 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <common/mi-lttng.h>
+
 #include "../command.h"
 #include "../utils.h"
 
@@ -53,6 +55,8 @@ enum {
        OPT_LIVE_TIMER,
 };
 
+static struct mi_writer *writer;
+
 static struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
        {"help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL},
@@ -147,6 +151,59 @@ static void usage(FILE *ofp)
        fprintf(ofp, "\n");
 }
 
+/*
+ * Retrieve the created session and
+ * mi output it of the created session based on provided argument
+ * This is currently a summary of what was pretty printed and is subject to
+ * enhancements.
+ * str_url is a placement string for output  url (snapshot or regular trace)
+ */
+static int mi_created_session(const char *session_name)
+{
+       int ret, i, count, found;
+       struct lttng_session *sessions;
+
+       /* session_name should not be null */
+       assert(session_name);
+       assert(writer);
+
+       count = lttng_list_sessions(&sessions);
+       if (count < 0) {
+               ret = count;
+               ERR("%s", lttng_strerror(ret));
+               goto error;
+       }
+
+       if (count == 0) {
+               ERR("Error session creation failed: session %s not found", session_name);
+               ret = -LTTNG_ERR_SESS_NOT_FOUND;
+               goto end;
+       }
+
+       found = 0;
+       for (i = 0; i < count; i++) {
+               if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) {
+                       found = 1;
+                       ret = mi_lttng_session(writer, &sessions[i], 0);
+                       if (ret) {
+                               goto error;
+                       }
+                       break;
+               }
+       }
+
+       if (!found) {
+               ret = -LTTNG_ERR_SESS_NOT_FOUND;
+       } else {
+               ret = CMD_SUCCESS;
+       }
+
+error:
+       free(sessions);
+end:
+       return ret;
+}
+
 /*
  * For a session name, set the consumer URLs.
  */
@@ -304,7 +361,7 @@ static int create_session(void)
                        goto error;
                }
 
-               /* Create URL string from the local filesytem path */
+               /* Create URL string from the local file system path */
                ret = asprintf(&alloc_url, "file://%s", traces_path);
                if (ret < 0) {
                        PERROR("asprintf url path");
@@ -437,6 +494,15 @@ static int create_session(void)
                                "be set in overwrite mode and mmap output.");
        }
 
+       /* Mi output */
+       if (lttng_opt_mi) {
+               ret = mi_created_session(session_name);
+               if (ret) {
+                       ret = CMD_ERROR;
+                       goto error;
+               }
+       }
+
        /* Init lttng session config */
        ret = config_init(session_name);
        if (ret < 0) {
@@ -464,7 +530,7 @@ error:
  */
 int cmd_create(int argc, const char **argv)
 {
-       int opt, ret = CMD_SUCCESS;
+       int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1;
        char *opt_arg = NULL;
        static poptContext pc;
 
@@ -515,13 +581,6 @@ int cmd_create(int argc, const char **argv)
                }
        }
 
-       /* TODO: mi support */
-       if (lttng_opt_mi) {
-               ret = -LTTNG_ERR_MI_NOT_IMPLEMENTED;
-               ERR("mi option not supported");
-               goto end;
-       }
-
        if (opt_no_consumer) {
                MSG("The option --no-consumer is obsolete. Use --no-output now.");
                ret = CMD_WARNING;
@@ -534,11 +593,72 @@ int cmd_create(int argc, const char **argv)
                goto end;
        }
 
+
+       /* MI initilisation */
+       if (lttng_opt_mi) {
+               writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
+               if (!writer) {
+                       ret = -LTTNG_ERR_NOMEM;
+                       goto end;
+               }
+
+               /* Open command element */
+               ret = mi_lttng_writer_command_open(writer,
+                               mi_lttng_element_command_create);
+               if (ret) {
+                       ret = CMD_ERROR;
+                       goto end;
+               }
+
+               /* Open output element */
+               ret = mi_lttng_writer_open_element(writer,
+                               mi_lttng_element_command_output);
+               if (ret) {
+                       ret = CMD_ERROR;
+                       goto end;
+               }
+       }
        opt_session_name = (char*) poptGetArg(pc);
 
-       ret = create_session();
+       command_ret = create_session();
+       if (command_ret) {
+               success = 0;
+       }
+
+       if (lttng_opt_mi) {
+               /* Close  output element */
+               ret = mi_lttng_writer_close_element(writer);
+               if (ret) {
+                       ret = CMD_ERROR;
+                       goto end;
+               }
+
+               /* Success ? */
+               ret = mi_lttng_writer_write_element_bool(writer,
+                               mi_lttng_element_command_success, success);
+               if (ret) {
+                       ret = CMD_ERROR;
+                       goto end;
+               }
+
+               /* Command element close */
+               ret = mi_lttng_writer_command_close(writer);
+               if (ret) {
+                       ret = CMD_ERROR;
+                       goto end;
+               }
+       }
 
 end:
+       /* Mi clean-up */
+       if (writer && mi_lttng_writer_destroy(writer)) {
+               /* Preserve original error code */
+               ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL;
+       }
+
+       /* Overwrite ret if an error occured in create_session() */
+       ret = command_ret ? command_ret : ret;
+
        poptFreeContext(pc);
        return ret;
 }

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index e7f08117766c738b9f07ad2b307c1d03c5e12283..0994678a334377faa00ca8c75899dcc560c7084a 100644 (file)
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -25,13 +25,14 @@
 
 /* Strings related to command */
 const char * const mi_lttng_element_command = "command";
+const char * const mi_lttng_element_command_name = "name";
 const char * const mi_lttng_element_command_version = "version";
 const char * const mi_lttng_element_command_list = "list";
 const char * const mi_lttng_element_command_save = "save";
 const char * const mi_lttng_element_command_load = "load";
-const char * const mi_lttng_element_command_name = "name";
 const char * const mi_lttng_element_command_start = "start";
 const char * const mi_lttng_element_command_stop = "stop";
+const char * const mi_lttng_element_command_create = "create";
 const char * const mi_lttng_element_command_output = "output";
 const char * const mi_lttng_element_command_success = "success";
 

diff --git a/src/common/mi-lttng.h b/src/common/mi-lttng.h
index 6151118ca63ebec5020b446d2b2b240985166857..2176b09ad76d70e16cd94863dc6dd6aba08af0cf 100644 (file)
--- a/src/common/mi-lttng.h
+++ b/src/common/mi-lttng.h
@@ -47,13 +47,14 @@ struct mi_lttng_version {
 
 /* Strings related to command */
 const char * const mi_lttng_element_command;
+const char * const mi_lttng_element_command_name;
 const char * const mi_lttng_element_command_version;
 const char * const mi_lttng_element_command_list;
 const char * const mi_lttng_element_command_save;
 const char * const mi_lttng_element_command_load;
 const char * const mi_lttng_element_command_stop;
-const char * const mi_lttng_element_command_name;
 const char * const mi_lttng_element_command_start;
+const char * const mi_lttng_element_command_create;
 const char * const mi_lttng_element_command_output;
 const char * const mi_lttng_element_command_success;
 

diff --git a/src/common/mi_lttng.xsd b/src/common/mi_lttng.xsd
index 587d735c9553fd252031670f4ad6a24cc560c22f..ce472a3860262e7e9e487c59bcd69adf6e8c3e36 100644 (file)
--- a/src/common/mi_lttng.xsd
+++ b/src/common/mi_lttng.xsd
@@ -313,6 +313,7 @@ THE SOFTWARE.
                <xs:choice>
                        <xs:element name="domains" type="domains_type" minOccurs="0" />
                        <xs:element name="sessions" type="sessions_type" minOccurs="0" />
+                       <xs:element name="session" type="session_type" minOccurs="0" />
                        <xs:element name="version" type="version_type" minOccurs="0" />
                        <xs:element name="save" type="save_type" minOccurs="0" />
                        <xs:element name="load" type="load_type" minOccurs="0" />
@@ -322,6 +323,7 @@ THE SOFTWARE.
        <!-- Maps to the mi_lttng commands -->
        <xs:simpleType name="command_string_type">
                <xs:restriction base="xs:string">
+                       <xs:enumeration value="create" />
                        <xs:enumeration value="list" />
                        <xs:enumeration value="version" />
                        <xs:enumeration value="save" />