X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=acc705b81ac1a42f948f2f101de82269f7aaa761;hb=ceb6ba5100c73f6a2b39475c89f3317d64fc9b48;hp=4a47d6714f8f9b38f6f48b5f6363bfa1e4e17125;hpb=1a2416565951eff19530564c552931cc71866e8c;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 4a47d6714..acc705b81 100644
--- 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,57 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "\n");
 }
 
+/*
+ * Retrieve the created session and mi output it based on provided argument
+ * This is currently a summary of what was pretty printed and is subject to
+ * enhancements.
+ */
+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 +359,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");
@@ -387,7 +442,8 @@ static int create_session(void)
 		} else {
 			pathname = INSTALL_BIN_PATH "/lttng-relayd";
 		}
-		if (!check_relayd() && spawn_relayd(pathname, 0) < 0) {
+		if (!opt_url && !opt_data_url && !check_relayd() &&
+				spawn_relayd(pathname, 0) < 0) {
 			goto error;
 		}
 		ret = lttng_create_session_live(session_name, url, opt_live_timer);
@@ -436,6 +492,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) {
@@ -463,7 +528,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;
 
@@ -526,11 +591,72 @@ int cmd_create(int argc, const char **argv)
 		goto end;
 	}
 
+
+	/* MI initialization */
+	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 occurred in create_session() */
+	ret = command_ret ? command_ret : ret;
+
 	poptFreeContext(pc);
 	return ret;
 }