X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fmetadata.c;h=e702c5ebaca50b6ee2f71e60b498ff57d714c352;hp=20c577e53a9c2b07cf2d54effac7d59166b60887;hb=9927c13b08e58e711104893496060fc5eb505f34;hpb=93ec662e687dc15a3601704a1e0c96c51ad228c9

diff --git a/src/bin/lttng/commands/metadata.c b/src/bin/lttng/commands/metadata.c
index 20c577e53..e702c5eba 100644
--- a/src/bin/lttng/commands/metadata.c
+++ b/src/bin/lttng/commands/metadata.c
@@ -33,12 +33,20 @@ static char *session_name = NULL;
 
 static int metadata_regenerate(int argc, const char **argv);
 
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-metadata.1.h>
+;
+#endif
+
 enum {
 	OPT_HELP = 1,
 	OPT_LIST_OPTIONS,
 	OPT_LIST_COMMANDS,
 };
 
+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, },
@@ -53,23 +61,6 @@ static struct cmd_struct actions[] = {
 	{ NULL, NULL }	/* Array closure */
 };
 
-/*
- * usage
- */
-static void usage(FILE *ofp)
-{
-	fprintf(ofp, "usage: lttng metadata [OPTION] ACTION\n");
-	fprintf(ofp, "\n");
-	fprintf(ofp, "Actions:\n");
-	fprintf(ofp, "   regenerate\n");
-	fprintf(ofp, "      Regenerate and overwrite the metadata of the session.\n");
-	fprintf(ofp, "Options:\n");
-	fprintf(ofp, "  -h, --help               Show this help.\n");
-	fprintf(ofp, "      --list-options       Simple listing of options.\n");
-	fprintf(ofp, "  -s, --session NAME       Apply to session name.\n");
-	fprintf(ofp, "\n");
-}
-
 /*
  * Count and return the number of arguments in argv.
  */
@@ -90,10 +81,18 @@ static int metadata_regenerate(int argc, const char **argv)
 {
 	int ret;
 
-	ret = lttng_metadata_regenerate(session_name);
+	if (argc > 1) {
+		ret = CMD_UNDEFINED;
+		goto end;
+	}
+	ret = lttng_regenerate_metadata(session_name);
 	if (ret == 0) {
 		MSG("Metadata successfully regenerated for session %s", session_name);
+	} else {
+		ERR("%s", lttng_strerror(ret));
 	}
+
+end:
 	return ret;
 }
 
@@ -103,18 +102,44 @@ static int handle_command(const char **argv)
 	int ret = CMD_SUCCESS, i = 0, argc, command_ret = CMD_SUCCESS;
 
 	if (argv == NULL) {
-		usage(stderr);
-		command_ret = CMD_ERROR;
+		ERR("No action specified for metadata command.");
+		ret = CMD_ERROR;
 		goto end;
 	}
 
 	argc = count_arguments(argv);
+	assert(argc >= 1);
 
 	cmd = &actions[i];
 	while (cmd->func != NULL) {
 		/* Find command */
 		if (strcmp(argv[0], cmd->name) == 0) {
+			if (lttng_opt_mi) {
+				/* Action element */
+				ret = mi_lttng_writer_open_element(writer,
+						mi_lttng_element_command_metadata_action);
+				if (ret) {
+					ret = CMD_ERROR;
+					goto end;
+				}
+
+				/* Name of the action */
+				ret = mi_lttng_writer_write_element_string(writer,
+						config_element_name, argv[0]);
+				if (ret) {
+					ret = CMD_ERROR;
+					goto end;
+				}
+			}
 			command_ret = cmd->func(argc, argv);
+			if (lttng_opt_mi) {
+				/* Close output and action element */
+				ret = mi_lttng_writer_close_element(writer);
+				if (ret) {
+					ret = CMD_ERROR;
+					goto end;
+				}
+			}
 			goto end;
 		}
 
@@ -134,11 +159,11 @@ end:
  */
 int cmd_metadata(int argc, const char **argv)
 {
-	int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS;
+	int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1;
 	static poptContext pc;
 
 	if (argc < 1) {
-		usage(stderr);
+		SHOW_HELP();
 		ret = CMD_ERROR;
 		goto end;
 	}
@@ -146,10 +171,33 @@ int cmd_metadata(int argc, const char **argv)
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
 
+	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_metadata);
+		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;
+		}
+	}
+
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stdout);
+			SHOW_HELP();
 			goto end;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
@@ -158,7 +206,7 @@ int cmd_metadata(int argc, const char **argv)
 			list_commands(actions, stdout);
 			goto end;
 		default:
-			usage(stderr);
+			SHOW_HELP();
 			ret = CMD_UNDEFINED;
 			goto end;
 		}
@@ -176,14 +224,40 @@ int cmd_metadata(int argc, const char **argv)
 
 	command_ret = handle_command(poptGetArgs(pc));
 	if (command_ret) {
-		switch (-command_ret) {
-		default:
-			ERR("%s", lttng_strerror(command_ret));
-			break;
+		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;
+	}
+
 	if (!opt_session_name) {
 		free(session_name);
 	}