X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fjul-logging.c;h=e8d33dbee3c56f64fd4f2e3ec9e32458e4a70828;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=588835951ef879f1f7b3b8b719bd668f051a5920;hpb=b47b01d8f6e8147f39def009154a58ca393a744b;p=lttng-tools.git

diff --git a/src/common/event-rule/jul-logging.c b/src/common/event-rule/jul-logging.c
index 588835951..e8d33dbee 100644
--- a/src/common/event-rule/jul-logging.c
+++ b/src/common/event-rule/jul-logging.c
@@ -5,21 +5,21 @@
  *
  */
 
-#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)
@@ -151,8 +151,8 @@ static bool lttng_event_rule_jul_logging_is_equal(
 	}
 
 	/* Long check. */
-	assert(a->pattern);
-	assert(b->pattern);
+	LTTNG_ASSERT(a->pattern);
+	LTTNG_ASSERT(b->pattern);
 	if (strcmp(a->pattern, b->pattern)) {
 		goto end;
 	}
@@ -194,8 +194,8 @@ static int generate_agent_filter(
 	const struct lttng_log_level_rule *log_level_rule = NULL;
 	enum lttng_event_rule_status status;
 
-	assert(rule);
-	assert(_agent_filter);
+	LTTNG_ASSERT(rule);
+	LTTNG_ASSERT(_agent_filter);
 
 	status = lttng_event_rule_jul_logging_get_name_pattern(rule, &pattern);
 	if (status != LTTNG_EVENT_RULE_STATUS_OK) {
@@ -302,7 +302,7 @@ lttng_event_rule_jul_logging_generate_filter_bytecode(
 	struct lttng_bytecode *bytecode = NULL;
 	char *agent_filter;
 
-	assert(rule);
+	LTTNG_ASSERT(rule);
 
 	jul_logging = container_of(
 			rule, struct lttng_event_rule_jul_logging, parent);
@@ -356,7 +356,7 @@ static const char *lttng_event_rule_jul_logging_get_internal_filter(
 {
 	struct lttng_event_rule_jul_logging *jul_logging;
 
-	assert(rule);
+	LTTNG_ASSERT(rule);
 	jul_logging = container_of(
 			rule, struct lttng_event_rule_jul_logging, parent);
 	return jul_logging->internal_filter.filter;
@@ -368,7 +368,7 @@ lttng_event_rule_jul_logging_get_internal_filter_bytecode(
 {
 	struct lttng_event_rule_jul_logging *jul_logging;
 
-	assert(rule);
+	LTTNG_ASSERT(rule);
 	jul_logging = container_of(
 			rule, struct lttng_event_rule_jul_logging, parent);
 	return jul_logging->internal_filter.bytecode;
@@ -478,6 +478,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;
+
+	LTTNG_ASSERT(rule);
+	LTTNG_ASSERT(writer);
+	LTTNG_ASSERT(IS_JUL_LOGGING_EVENT_RULE(rule));
+
+	status = lttng_event_rule_jul_logging_get_name_pattern(
+			rule, &name_pattern);
+	LTTNG_ASSERT(status == LTTNG_EVENT_RULE_STATUS_OK);
+	LTTNG_ASSERT(name_pattern);
+
+	status = lttng_event_rule_jul_logging_get_filter(rule, &filter);
+	LTTNG_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);
+	LTTNG_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 +583,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;
 
@@ -619,7 +697,7 @@ skip_filter_expression:
 			goto end;
 		}
 
-		assert(ret == jul_logging_comm->log_level_rule_len);
+		LTTNG_ASSERT(ret == jul_logging_comm->log_level_rule_len);
 	}
 
 	/* Skip after the log level rule. */