X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fset_session.c;h=3196f12bdd3863373938267a4106241eaac9100c;hp=a428aed16ce239257253ae2f1fd7178fc4ff69e8;hb=6c1c0768320135c6936c371b09731851b508c023;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76

diff --git a/src/bin/lttng/commands/set_session.c b/src/bin/lttng/commands/set_session.c
index a428aed16..3196f12bd 100644
--- a/src/bin/lttng/commands/set_session.c
+++ b/src/bin/lttng/commands/set_session.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <popt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -23,6 +24,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <assert.h>
+
+#include <common/mi-lttng.h>
 
 #include "../command.h"
 
@@ -33,6 +37,8 @@ enum {
 	OPT_LIST_OPTIONS,
 };
 
+static struct mi_writer *writer;
+
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
@@ -45,7 +51,7 @@ static struct poptOption long_options[] = {
  */
 static void usage(FILE *ofp)
 {
-	fprintf(ofp, "usage: lttng set-session NAME\n");
+	fprintf(ofp, "usage: lttng set-session NAME [OPTIONS]\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Options:\n");
 	fprintf(ofp, "  -h, --help               Show this help\n");
@@ -53,6 +59,47 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "\n");
 }
 
+/*
+ * Print the necessary mi for a session and name.
+ */
+static int mi_print(char *session_name)
+{
+	int ret;
+
+	assert(writer);
+	assert(session_name);
+
+	/*
+	 * Open a sessions element
+	 * This is purely for validation purpose
+	 */
+	ret = mi_lttng_sessions_open(writer);
+	if (ret) {
+		goto end;
+	}
+
+	/* Open a session element */
+	ret = mi_lttng_writer_open_element(writer, config_element_session);
+	if (ret) {
+		goto end;
+	}
+
+	/* Session name */
+	ret = mi_lttng_writer_write_element_string(writer , config_element_name,
+			session_name);
+	if (ret) {
+		goto end;
+	}
+
+	/* Close session and sessions element */
+	ret = mi_lttng_close_multi_element(writer, 2);
+	if (ret) {
+		goto end;
+	}
+end:
+	return ret;
+}
+
 /*
  *  set_session
  */
@@ -60,6 +107,13 @@ static int set_session(void)
 {
 	int ret = CMD_SUCCESS;
 
+	if (opt_session_name && strlen(opt_session_name) > NAME_MAX) {
+		ERR("Session name too long. Length must be lower or equal to %d",
+			NAME_MAX);
+		ret = CMD_ERROR;
+		goto error;
+	}
+
 	ret = config_init(opt_session_name);
 	if (ret < 0) {
 		ERR("Unable to set session name");
@@ -68,6 +122,14 @@ static int set_session(void)
 	}
 
 	MSG("Session set to %s", opt_session_name);
+	if (lttng_opt_mi) {
+		ret = mi_print(opt_session_name);
+		if (ret) {
+			ret = CMD_ERROR;
+			goto error;
+		}
+	}
+
 	ret = CMD_SUCCESS;
 
 error:
@@ -79,7 +141,7 @@ error:
  */
 int cmd_set_session(int argc, const char **argv)
 {
-	int opt, ret = CMD_SUCCESS;
+	int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1;
 	static poptContext pc;
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
@@ -108,9 +170,71 @@ int cmd_set_session(int argc, const char **argv)
 		goto end;
 	}
 
-	ret = set_session();
+	/* Mi check */
+	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_set_session);
+		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;
+		}
+	}
+
+	command_ret = set_session();
+	if (command_ret) {
+		success = 0;
+	}
+
+	/* Mi closing */
+	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 during set_session() */
+	ret = command_ret ? command_ret : ret;
+
 	poptFreeContext(pc);
 	return ret;
 }