X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconditions%2Fevent-rule-matches.c;h=21963d1ae9f12d380ed2cbbf82339f3d6ffcc19f;hb=6a751b953a43c566b74818ec6325db0978e16c66;hp=b2abcc7648e072f2225a5cf50b472278d2f84989;hpb=4f7da553ae57a6c947da2b9668c06418b2d50e99;p=lttng-tools.git

diff --git a/src/common/conditions/event-rule-matches.c b/src/common/conditions/event-rule-matches.c
index b2abcc764..21963d1ae 100644
--- a/src/common/conditions/event-rule-matches.c
+++ b/src/common/conditions/event-rule-matches.c
@@ -7,8 +7,8 @@
 
 #include <assert.h>
 #include <common/error.h>
-#include <common/event-expr-to-bytecode.h>
 #include <common/macros.h>
+#include <common/mi-lttng.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <lttng/condition/condition-internal.h>
@@ -434,6 +434,81 @@ void destroy_capture_descriptor(void *ptr)
 	free(desc);
 }
 
+static enum lttng_error_code lttng_condition_event_rule_matches_mi_serialize(
+		const struct lttng_condition *condition,
+		struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	enum lttng_condition_status status;
+	const struct lttng_event_rule *rule = NULL;
+	unsigned int capture_descriptor_count, i;
+
+	assert(condition);
+	assert(writer);
+	assert(IS_EVENT_RULE_MATCHES_CONDITION(condition));
+
+	status = lttng_condition_event_rule_matches_get_rule(condition, &rule);
+	assert(status == LTTNG_CONDITION_STATUS_OK);
+	assert(rule != NULL);
+
+	status = lttng_condition_event_rule_matches_get_capture_descriptor_count(
+			condition, &capture_descriptor_count);
+	assert(status == LTTNG_CONDITION_STATUS_OK);
+
+	/* Open condition event rule matches element. */
+	ret = mi_lttng_writer_open_element(
+			writer, mi_lttng_element_condition_event_rule_matches);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Serialize the event rule. */
+	ret_code = lttng_event_rule_mi_serialize(rule, writer);
+	if (ret_code != LTTNG_OK) {
+		goto end;
+	}
+
+	/* Open the capture descriptors element. */
+	ret = mi_lttng_writer_open_element(
+			writer, mi_lttng_element_capture_descriptors);
+	if (ret) {
+		goto mi_error;
+	}
+
+	for (i = 0; i < capture_descriptor_count; i++) {
+		const struct lttng_event_expr *descriptor = NULL;
+
+		descriptor = lttng_condition_event_rule_matches_get_capture_descriptor_at_index(
+				condition, i);
+		assert(descriptor);
+
+		ret_code = lttng_event_expr_mi_serialize(descriptor, writer);
+		if (ret_code != LTTNG_OK) {
+			goto end;
+		}
+	}
+
+	/* Close capture descriptors element. */
+	ret = mi_lttng_writer_close_element(writer);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Close condition_event_rule_matches. */
+	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_condition *lttng_condition_event_rule_matches_create(
 		struct lttng_event_rule *rule)
 {
@@ -457,6 +532,7 @@ struct lttng_condition *lttng_condition_event_rule_matches_create(
 			lttng_condition_event_rule_matches_serialize,
 	condition->parent.equal = lttng_condition_event_rule_matches_is_equal,
 	condition->parent.destroy = lttng_condition_event_rule_matches_destroy,
+	condition->parent.mi_serialize = lttng_condition_event_rule_matches_mi_serialize,
 
 	lttng_event_rule_get(rule);
 	condition->rule = rule;
@@ -797,7 +873,11 @@ lttng_condition_event_rule_matches_append_capture_descriptor(
 	}
 
 	switch(lttng_event_rule_get_type(rule)) {
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+	case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+	case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+	case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
 		/* Supported. */
 		status = LTTNG_CONDITION_STATUS_OK;