X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fstop-session.c;h=fa2c77b1352cf3bff466c89cc627602cd28ed279;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=9f74bf88496efe26309c6d187b28e847c78fbadb;hpb=7f4d5b07cf7be895b38b69073389a4fcc318ec29;p=lttng-tools.git

diff --git a/src/common/actions/stop-session.c b/src/common/actions/stop-session.c
index 9f74bf884..fa2c77b13 100644
--- a/src/common/actions/stop-session.c
+++ b/src/common/actions/stop-session.c
@@ -5,9 +5,9 @@
  *
  */
 
-#include <assert.h>
 #include <common/error.h>
 #include <common/macros.h>
+#include <common/mi-lttng.h>
 #include <lttng/action/action-internal.h>
 #include <lttng/action/rate-policy-internal.h>
 #include <lttng/action/rate-policy.h>
@@ -45,7 +45,7 @@ lttng_action_stop_session_internal_get_rate_policy(
 static struct lttng_action_stop_session *action_stop_session_from_action(
 		struct lttng_action *action)
 {
-	assert(action);
+	LTTNG_ASSERT(action);
 
 	return container_of(action, struct lttng_action_stop_session, parent);
 }
@@ -53,7 +53,7 @@ static struct lttng_action_stop_session *action_stop_session_from_action(
 static const struct lttng_action_stop_session *
 action_stop_session_from_action_const(const struct lttng_action *action)
 {
-	assert(action);
+	LTTNG_ASSERT(action);
 
 	return container_of(action, struct lttng_action_stop_session, parent);
 }
@@ -92,8 +92,8 @@ static bool lttng_action_stop_session_is_equal(
 	b = action_stop_session_from_action_const(_b);
 
 	/* Action is not valid if this is not true. */
-	assert(a->session_name);
-	assert(b->session_name);
+	LTTNG_ASSERT(a->session_name);
+	LTTNG_ASSERT(b->session_name);
 	if (strcmp(a->session_name, b->session_name)) {
 		goto end;
 	}
@@ -111,12 +111,12 @@ static int lttng_action_stop_session_serialize(
 	size_t session_name_len;
 	int ret;
 
-	assert(action);
-	assert(payload);
+	LTTNG_ASSERT(action);
+	LTTNG_ASSERT(payload);
 
 	action_stop_session = action_stop_session_from_action(action);
 
-	assert(action_stop_session->session_name);
+	LTTNG_ASSERT(action_stop_session->session_name);
 
 	DBG("Serializing stop session action: session-name: %s",
 			action_stop_session->session_name);
@@ -216,7 +216,7 @@ ssize_t lttng_action_stop_session_create_from_payload(
 		goto end;
 	}
 
-	assert(policy);
+	LTTNG_ASSERT(policy);
 	status = lttng_action_stop_session_set_rate_policy(action, policy);
 	if (status != LTTNG_ACTION_STATUS_OK) {
 		consumed_len = -1;
@@ -233,6 +233,62 @@ end:
 	return consumed_len;
 }
 
+static enum lttng_error_code lttng_action_stop_session_mi_serialize(
+		const struct lttng_action *action, struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	enum lttng_action_status status;
+	const char *session_name = NULL;
+	const struct lttng_rate_policy *policy = NULL;
+
+	LTTNG_ASSERT(action);
+	LTTNG_ASSERT(IS_STOP_SESSION_ACTION(action));
+
+	status = lttng_action_stop_session_get_session_name(
+			action, &session_name);
+	LTTNG_ASSERT(status == LTTNG_ACTION_STATUS_OK);
+	LTTNG_ASSERT(session_name != NULL);
+
+	status = lttng_action_stop_session_get_rate_policy(action, &policy);
+	LTTNG_ASSERT(status == LTTNG_ACTION_STATUS_OK);
+	LTTNG_ASSERT(policy != NULL);
+
+	/* Open action stop session. */
+	ret = mi_lttng_writer_open_element(
+			writer, mi_lttng_element_action_start_session);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Session name. */
+	ret = mi_lttng_writer_write_element_string(
+			writer, mi_lttng_element_session_name, session_name);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Rate policy. */
+	ret_code = lttng_rate_policy_mi_serialize(policy, writer);
+	if (ret_code != LTTNG_OK) {
+		goto end;
+	}
+
+	/* Close action stop session element. */
+	ret = mi_lttng_writer_close_element(writer);
+	if (ret) {
+		goto mi_error;
+	}
+
+	ret_code = LTTNG_OK;
+	goto end;
+
+mi_error:
+	ret_code = LTTNG_ERR_MI_IO_FAIL;
+end:
+	return ret_code;
+}
+
 struct lttng_action *lttng_action_stop_session_create(void)
 {
 	struct lttng_action *action = NULL;
@@ -255,7 +311,9 @@ struct lttng_action *lttng_action_stop_session_create(void)
 			lttng_action_stop_session_serialize,
 			lttng_action_stop_session_is_equal,
 			lttng_action_stop_session_destroy,
-			lttng_action_stop_session_internal_get_rate_policy);
+			lttng_action_stop_session_internal_get_rate_policy,
+			lttng_action_generic_add_error_query_results,
+			lttng_action_stop_session_mi_serialize);
 
 	status = lttng_action_stop_session_set_rate_policy(action, policy);
 	if (status != LTTNG_ACTION_STATUS_OK) {