X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=00f8f47e363401400db7d613939b8be17923245e;hb=4627fa543a2eb65d7b046b18e015986f45de5835;hp=5b41ad0537d41e6effb00231490a307b1f5f9c72;hpb=556124d78016aaf447607b5208b50c5fe802bf27;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index 5b41ad053..00f8f47e3 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -15,6 +15,7 @@
 
 #include "common/argpar/argpar.h"
 #include "common/dynamic-array.h"
+#include "common/mi-lttng.h"
 #include "common/string-utils/string-utils.h"
 #include "common/utils.h"
 /* For lttng_event_rule_type_str(). */
@@ -2186,9 +2187,35 @@ int cmd_add_trigger(int argc, const char **argv)
 	int i;
 	char *owner_uid = NULL;
 	enum lttng_error_code ret_code;
+	struct mi_writer *mi_writer = NULL;
 
 	lttng_dynamic_pointer_array_init(&actions, lttng_actions_destructor);
 
+	if (lttng_opt_mi) {
+		mi_writer = mi_lttng_writer_create(
+				fileno(stdout), lttng_opt_mi);
+		if (!mi_writer) {
+			ret = CMD_ERROR;
+			goto error;
+		}
+
+		/* Open command element. */
+		ret = mi_lttng_writer_command_open(mi_writer,
+				mi_lttng_element_command_add_trigger);
+		if (ret) {
+			ret = CMD_ERROR;
+			goto error;
+		}
+
+		/* Open output element. */
+		ret = mi_lttng_writer_open_element(
+				mi_writer, mi_lttng_element_command_output);
+		if (ret) {
+			ret = CMD_ERROR;
+			goto error;
+		}
+	}
+
 	while (true) {
 		enum argpar_state_parse_next_status status;
 		const struct argpar_item_opt *item_opt;
@@ -2278,7 +2305,7 @@ int cmd_add_trigger(int argc, const char **argv)
 				goto error;
 			}
 
-			/* Ownership of the action was transferred to the group. */
+			/* Ownership of the action was transferred to the list. */
 			action = NULL;
 
 			break;
@@ -2374,7 +2401,24 @@ int cmd_add_trigger(int argc, const char **argv)
 		goto error;
 	}
 
-	MSG("Trigger registered successfully.");
+	if (lttng_opt_mi) {
+		ret_code = lttng_trigger_mi_serialize(trigger, mi_writer, NULL);
+		if (ret_code != LTTNG_OK) {
+			goto error;
+		}
+	} else {
+		const char *returned_trigger_name;
+		const enum lttng_trigger_status trigger_status =
+				lttng_trigger_get_name(trigger,
+						&returned_trigger_name);
+
+		if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
+			WARN("Failed to retrieve the added trigger's name.");
+		} else {
+			MSG("Added trigger `%s`.", returned_trigger_name);
+		}
+	}
+
 	ret = 0;
 
 	goto end;
@@ -2383,6 +2427,33 @@ error:
 	ret = 1;
 
 end:
+	/* Mi closing. */
+	if (lttng_opt_mi && mi_writer) {
+		int mi_ret;
+
+		/* Close output element. */
+		mi_ret = mi_lttng_writer_close_element(mi_writer);
+		if (mi_ret) {
+			ret = 1;
+			goto cleanup;
+		}
+
+		mi_ret = mi_lttng_writer_write_element_bool(mi_writer,
+				mi_lttng_element_command_success, ret ? 0 : 1);
+		if (mi_ret) {
+			ret = 1;
+			goto cleanup;
+		}
+
+		/* Command element close. */
+		mi_ret = mi_lttng_writer_command_close(mi_writer);
+		if (mi_ret) {
+			ret = 1;
+			goto cleanup;
+		}
+	}
+
+cleanup:
 	argpar_state_destroy(argpar_state);
 	argpar_item_destroy(argpar_item);
 	lttng_dynamic_pointer_array_reset(&actions);
@@ -2393,5 +2464,10 @@ end:
 	free(error);
 	free(name);
 	free(owner_uid);
+	if (mi_writer && mi_lttng_writer_destroy(mi_writer)) {
+		/* Preserve original error code. */
+		ret = ret ? ret : CMD_ERROR;
+	}
+
 	return ret;
 }