X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-expr%2Fevent-expr.c;h=7b07312f2c973dd8fdc81856cdd0e6bd5f9c7aaa;hb=ca806b0b247f89c62ac628a7779ae84049a8c2d7;hp=1351a347f5de21ca054010aa8bcc088a73a94915;hpb=1aa9c49c60b7d7370ceafc3ac076de423de22b7f;p=lttng-tools.git

diff --git a/src/common/event-expr/event-expr.c b/src/common/event-expr/event-expr.c
index 1351a347f..7b07312f2 100644
--- a/src/common/event-expr/event-expr.c
+++ b/src/common/event-expr/event-expr.c
@@ -8,12 +8,12 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <stddef.h>
 
 #include <common/bytecode/bytecode.h>
 #include <common/error.h>
 #include <common/macros.h>
+#include <common/mi-lttng.h>
 #include <lttng/event-expr-internal.h>
 #include <lttng/event-expr.h>
 #include <stdio.h>
@@ -65,7 +65,7 @@ struct lttng_event_expr_field *create_field_event_expr(
 		goto error;
 	}
 
-	assert(name);
+	LTTNG_ASSERT(name);
 	expr->name = strdup(name);
 	if (!expr->name) {
 		goto error;
@@ -187,9 +187,6 @@ struct lttng_event_expr *lttng_event_expr_array_field_element_create(
 	goto end;
 
 error:
-	if (expr) {
-		lttng_event_expr_destroy(&expr->parent);
-	}
 	ret_parent_expr = NULL;
 
 end:
@@ -599,7 +596,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 int lttng_event_expr_to_bytecode(const struct lttng_event_expr *expr,
 		struct lttng_bytecode **bytecode_out)
 {
@@ -657,3 +653,266 @@ end:
 
 	return status;
 }
+
+static
+enum lttng_error_code lttng_event_expr_event_payload_field_mi_serialize(
+		const struct lttng_event_expr *expression,
+		struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	const char *name = NULL;
+
+	LTTNG_ASSERT(expression);
+	LTTNG_ASSERT(writer);
+	LTTNG_ASSERT(expression->type == LTTNG_EVENT_EXPR_TYPE_EVENT_PAYLOAD_FIELD);
+
+	name = lttng_event_expr_event_payload_field_get_name(expression);
+	LTTNG_ASSERT(name);
+
+	/* Open event expr payload field element. */
+	ret = mi_lttng_writer_open_element(
+			writer, mi_lttng_element_event_expr_payload_field);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Name. */
+	ret = mi_lttng_writer_write_element_string(
+			writer, config_element_name, name);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Close event expr payload field 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;
+}
+
+static
+enum lttng_error_code lttng_event_expr_channel_context_field_mi_serialize(
+		const struct lttng_event_expr *expression,
+		struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	const char *name = NULL;
+
+	LTTNG_ASSERT(expression);
+	LTTNG_ASSERT(writer);
+	LTTNG_ASSERT(expression->type == LTTNG_EVENT_EXPR_TYPE_CHANNEL_CONTEXT_FIELD);
+
+	name = lttng_event_expr_channel_context_field_get_name(expression);
+	LTTNG_ASSERT(name);
+
+	/* Open event expr channel context field element. */
+	ret = mi_lttng_writer_open_element(writer,
+			mi_lttng_element_event_expr_channel_context_field);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Name. */
+	ret = mi_lttng_writer_write_element_string(
+			writer, config_element_name, name);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Close event expr channel context field 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;
+}
+
+static
+enum lttng_error_code lttng_event_expr_app_specific_context_field_mi_serialize(
+		const struct lttng_event_expr *expression,
+		struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	const char *provider_name = NULL;
+	const char *type_name = NULL;
+
+	LTTNG_ASSERT(expression);
+	LTTNG_ASSERT(writer);
+	LTTNG_ASSERT(expression->type ==
+			LTTNG_EVENT_EXPR_TYPE_APP_SPECIFIC_CONTEXT_FIELD);
+
+	provider_name = lttng_event_expr_app_specific_context_field_get_provider_name(
+			expression);
+	LTTNG_ASSERT(provider_name);
+
+	type_name = lttng_event_expr_app_specific_context_field_get_type_name(
+			expression);
+	LTTNG_ASSERT(provider_name);
+
+	/* Open event expr app specific context field element. */
+	ret = mi_lttng_writer_open_element(writer,
+			mi_lttng_element_event_expr_app_specific_context_field);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Provider name. */
+	ret = mi_lttng_writer_write_element_string(writer,
+			mi_lttng_element_event_expr_provider_name,
+			provider_name);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Type name. */
+	ret = mi_lttng_writer_write_element_string(writer,
+			mi_lttng_element_event_expr_type_name, type_name);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Close event expr app specific context field 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;
+}
+
+static
+enum lttng_error_code lttng_event_expr_array_field_element_mi_serialize(
+		const struct lttng_event_expr *expression,
+		struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	enum lttng_event_expr_status status;
+	const struct lttng_event_expr *parent_expr = NULL;
+	unsigned int index;
+
+	LTTNG_ASSERT(expression);
+	LTTNG_ASSERT(writer);
+	LTTNG_ASSERT(expression->type == LTTNG_EVENT_EXPR_TYPE_ARRAY_FIELD_ELEMENT);
+
+	status = lttng_event_expr_array_field_element_get_index(
+			expression, &index);
+	LTTNG_ASSERT(status == LTTNG_EVENT_EXPR_STATUS_OK);
+
+	parent_expr = lttng_event_expr_array_field_element_get_parent_expr(
+			expression);
+	LTTNG_ASSERT(parent_expr != NULL);
+
+	/* Open event expr array field element. */
+	ret = mi_lttng_writer_open_element(writer,
+			mi_lttng_element_event_expr_array_field_element);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Index. */
+	ret = mi_lttng_writer_write_element_unsigned_int(
+			writer, mi_lttng_element_event_expr_index, index);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Parent expression. */
+	ret_code = lttng_event_expr_mi_serialize(parent_expr, writer);
+	if (ret_code != LTTNG_OK) {
+		goto end;
+	}
+
+	/* Close event expr array field 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;
+}
+
+enum lttng_error_code lttng_event_expr_mi_serialize(
+		const struct lttng_event_expr *expression,
+		struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+
+	LTTNG_ASSERT(expression);
+	LTTNG_ASSERT(writer);
+
+	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_event_expr);
+	if (ret) {
+		goto mi_error;
+	}
+
+	switch (expression->type) {
+	case LTTNG_EVENT_EXPR_TYPE_EVENT_PAYLOAD_FIELD:
+		ret_code = lttng_event_expr_event_payload_field_mi_serialize(
+				expression, writer);
+		break;
+	case LTTNG_EVENT_EXPR_TYPE_CHANNEL_CONTEXT_FIELD:
+		ret_code = lttng_event_expr_channel_context_field_mi_serialize(
+				expression, writer);
+		break;
+	case LTTNG_EVENT_EXPR_TYPE_APP_SPECIFIC_CONTEXT_FIELD:
+		ret_code = lttng_event_expr_app_specific_context_field_mi_serialize(
+				expression, writer);
+		break;
+	case LTTNG_EVENT_EXPR_TYPE_ARRAY_FIELD_ELEMENT:
+		ret_code = lttng_event_expr_array_field_element_mi_serialize(
+				expression, writer);
+		break;
+	default:
+		abort();
+	}
+
+	if (ret_code != LTTNG_OK) {
+		goto end;
+	}
+
+	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;
+}