X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fjul-logging.c;h=5f69f84c723b0636c48d844c4a920c2e7629afe3;hp=588835951ef879f1f7b3b8b719bd668f051a5920;hb=0f7c296359bf90005e1dadf2d7a02a4b223a8031;hpb=1575be4a0f558cd7bb6e5d0a3e9410c4640c9ee5

diff --git a/src/common/event-rule/jul-logging.c b/src/common/event-rule/jul-logging.c
index 588835951..5f69f84c7 100644
--- a/src/common/event-rule/jul-logging.c
+++ b/src/common/event-rule/jul-logging.c
@@ -8,18 +8,19 @@
 #include <assert.h>
 #include <common/credentials.h>
 #include <common/error.h>
+#include <common/hashtable/hashtable.h>
+#include <common/hashtable/utils.h>
 #include <common/macros.h>
+#include <common/mi-lttng.h>
 #include <common/optional.h>
-#include <common/payload.h>
 #include <common/payload-view.h>
+#include <common/payload.h>
 #include <common/runas.h>
-#include <common/hashtable/hashtable.h>
-#include <common/hashtable/utils.h>
 #include <common/string-utils/string-utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/jul-logging-internal.h>
-#include <lttng/log-level-rule.h>
 #include <lttng/event.h>
+#include <lttng/log-level-rule.h>
 
 #define IS_JUL_LOGGING_EVENT_RULE(rule) \
 	(lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_JUL_LOGGING)
@@ -478,6 +479,83 @@ error:
 	return event;
 }
 
+static enum lttng_error_code lttng_event_rule_jul_logging_mi_serialize(
+		const struct lttng_event_rule *rule, struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	enum lttng_event_rule_status status;
+
+	const char *filter = NULL;
+	const char *name_pattern = NULL;
+	const struct lttng_log_level_rule *log_level_rule = NULL;
+
+	assert(rule);
+	assert(writer);
+	assert(IS_JUL_LOGGING_EVENT_RULE(rule));
+
+	status = lttng_event_rule_jul_logging_get_name_pattern(
+			rule, &name_pattern);
+	assert(status == LTTNG_EVENT_RULE_STATUS_OK);
+	assert(name_pattern);
+
+	status = lttng_event_rule_jul_logging_get_filter(rule, &filter);
+	assert(status == LTTNG_EVENT_RULE_STATUS_OK ||
+			status == LTTNG_EVENT_RULE_STATUS_UNSET);
+
+	status = lttng_event_rule_jul_logging_get_log_level_rule(
+			rule, &log_level_rule);
+	assert(status == LTTNG_EVENT_RULE_STATUS_OK ||
+			status == LTTNG_EVENT_RULE_STATUS_UNSET);
+
+	/* Open event rule jul logging element. */
+	ret = mi_lttng_writer_open_element(
+			writer, mi_lttng_element_event_rule_jul_logging);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Name pattern. */
+	ret = mi_lttng_writer_write_element_string(writer,
+			mi_lttng_element_event_rule_name_pattern, name_pattern);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Filter expression. */
+	if (filter != NULL) {
+		ret = mi_lttng_writer_write_element_string(writer,
+				mi_lttng_element_event_rule_filter_expression,
+				filter);
+		if (ret) {
+			goto mi_error;
+		}
+	}
+
+	/* Log level rule. */
+	if (log_level_rule) {
+		ret_code = lttng_log_level_rule_mi_serialize(
+				log_level_rule, writer);
+		if (ret_code != LTTNG_OK) {
+			goto end;
+		}
+	}
+
+	/* Close event rule jul logging 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_event_rule *lttng_event_rule_jul_logging_create(void)
 {
 	struct lttng_event_rule *rule = NULL;
@@ -506,6 +584,7 @@ struct lttng_event_rule *lttng_event_rule_jul_logging_create(void)
 	tp_rule->parent.hash = lttng_event_rule_jul_logging_hash;
 	tp_rule->parent.generate_lttng_event =
 			lttng_event_rule_jul_logging_generate_lttng_event;
+	tp_rule->parent.mi_serialize = lttng_event_rule_jul_logging_mi_serialize;
 
 	tp_rule->log_level_rule = NULL;