X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fmi-lttng.c;h=30bd60328f33bc305cc8937811bebf71b642c6a7;hb=28676a1d553d82f961ac83147097c53dd8a401d2;hp=f0d074ea7a945e3bb8c1b3b2d37c2740938a363c;hpb=f40ef1d56886bc58f5d7e147d77f818f46b66456;p=lttng-tools.git

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index f0d074ea7..30bd60328 100644
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -397,6 +397,7 @@ const char *mi_lttng_domaintype_string(enum lttng_domain_type value)
 	default:
 		/* Should not have an unknown domain */
 		assert(0);
+		return NULL;
 	}
 }
 
@@ -413,6 +414,7 @@ const char *mi_lttng_buffertype_string(enum lttng_buffer_type value)
 	default:
 		/* Should not have an unknow buffer type */
 		assert(0);
+		return NULL;
 	}
 }
 
@@ -920,6 +922,7 @@ int mi_lttng_event_common_attributes(struct mi_writer *writer,
 		struct lttng_event *event)
 {
 	int ret;
+	const char *filter_expression;
 
 	/* Open event element */
 	ret = mi_lttng_writer_open_element(writer, config_element_event);
@@ -948,9 +951,20 @@ int mi_lttng_event_common_attributes(struct mi_writer *writer,
 		goto end;
 	}
 
-	/* Event filter enabled? */
-	ret = mi_lttng_writer_write_element_bool(writer,
-			config_element_filter, event->filter);
+	/* Event filter expression */
+	ret = lttng_event_get_filter_string(event, &filter_expression);
+	if (ret) {
+		goto end;
+	}
+
+	if (filter_expression) {
+		ret = mi_lttng_writer_write_element_string(writer,
+				config_element_filter_expression,
+				filter_expression);
+		if (ret) {
+			goto end;
+		}
+	}
 
 end:
 	return ret;