X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.c;h=ef98687d868108ef6e37e604b9c5e6c577f1cf00;hp=e2181f692d65c9beebe4890b256123c27b6336ef;hb=7b4aa11d71edf81f1e5a81a447b4e6b788551594;hpb=b789735ec96305f2e14fc9b9c75406ca215ddabb

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index e2181f692..ef98687d8 100644
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -16,10 +16,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
-#include <include/config.h>
-#include <common/config/config.h>
+#include <common/config/session-config.h>
 #include <lttng/snapshot-internal.h>
 #include "mi-lttng.h"
 
@@ -78,8 +76,7 @@ const char * const mi_lttng_context_type_perf_thread_counter = "PERF_THREAD_COUN
 const char * const mi_lttng_element_perf_counter_context = "perf_counter_context";
 
 /* Strings related to pid */
-const char * const mi_lttng_element_processes = "processes";
-const char * const mi_lttng_element_process = "process";
+const char * const mi_lttng_element_pid_id = "id";
 
 /* Strings related to save command */
 const char * const mi_lttng_element_save = "save";
@@ -400,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;
 	}
 }
 
@@ -416,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;
 	}
 }
 
@@ -923,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);
@@ -955,6 +955,23 @@ int mi_lttng_event_common_attributes(struct mi_writer *writer,
 	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;
 }
@@ -1153,27 +1170,25 @@ int mi_lttng_pids_open(struct mi_writer *writer)
 	return mi_lttng_writer_open_element(writer, config_element_pids);
 }
 
+/*
+ * TODO: move the listing of pid for user agent to process semantic on
+ * mi api bump. The use of process element break the mi api.
+ */
 LTTNG_HIDDEN
-int mi_lttng_processes_open(struct mi_writer *writer)
-{
-	return mi_lttng_writer_open_element(writer, mi_lttng_element_processes);
-}
-
-LTTNG_HIDDEN
-int mi_lttng_process(struct mi_writer *writer, pid_t pid , const char *name,
+int mi_lttng_pid(struct mi_writer *writer, pid_t pid , const char *name,
 		int is_open)
 {
 	int ret;
 
-	/* Open element process */
-	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_process);
+	/* Open pid process */
+	ret = mi_lttng_writer_open_element(writer, config_element_pid);
 	if (ret) {
 		goto end;
 	}
 
 	/* Writing pid number */
 	ret = mi_lttng_writer_write_element_signed_int(writer,
-			config_element_pid, (int)pid);
+			mi_lttng_element_pid_id, (int)pid);
 	if (ret) {
 		goto end;
 	}