MI: add <filter_expression> (event filter expression)

[lttng-tools.git] / src / common / mi-lttng.c

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index 44ff56f1e4ccf16aee5d097b39faa4d233d0f04c..ef98687d868108ef6e37e604b9c5e6c577f1cf00 100644 (file)
--- 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,6 @@ 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_pids = "pids";
-const char * const mi_lttng_element_pid = "pid";
 const char * const mi_lttng_element_pid_id = "id";
 
 /* Strings related to save command */
@@ -164,6 +160,10 @@ const char * const mi_lttng_element_snapshot_n_ptr = "n_ptr";
 const char * const mi_lttng_element_snapshot_session_name = "session_name";
 const char * const mi_lttng_element_snapshots = "snapshots";
 
+/* String related to track/untrack command */
+const char * const mi_lttng_element_track_untrack_all_wildcard = "*";
+
+
 /* This is a merge of jul loglevel and regular loglevel
  * Those should never overlap by definition
  * (see struct lttng_event loglevel)
@@ -392,9 +392,12 @@ const char *mi_lttng_domaintype_string(enum lttng_domain_type value)
                return config_domain_type_jul;
        case LTTNG_DOMAIN_LOG4J:
                return config_domain_type_log4j;
+       case LTTNG_DOMAIN_PYTHON:
+               return config_domain_type_python;
        default:
                /* Should not have an unknown domain */
                assert(0);
+               return NULL;
        }
 }
 
@@ -411,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;
        }
 }
 
@@ -918,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);
@@ -950,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;
 }
@@ -1119,20 +1141,47 @@ end:
        return ret;
 }
 
+LTTNG_HIDDEN
+int mi_lttng_trackers_open(struct mi_writer *writer)
+{
+       return mi_lttng_writer_open_element(writer, config_element_trackers);
+}
+
+LTTNG_HIDDEN
+int mi_lttng_pid_tracker_open(struct mi_writer *writer)
+{
+       int ret;
+
+       /* Open element pid_tracker */
+       ret = mi_lttng_writer_open_element(writer, config_element_pid_tracker);
+       if (ret) {
+               goto end;
+       }
+
+       /* Open targets element */
+       ret = mi_lttng_targets_open(writer);
+end:
+       return ret;
+}
+
 LTTNG_HIDDEN
 int mi_lttng_pids_open(struct mi_writer *writer)
 {
-       return mi_lttng_writer_open_element(writer, mi_lttng_element_pids);
+       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_pid(struct mi_writer *writer, pid_t pid , const char *cmdline,
+int mi_lttng_pid(struct mi_writer *writer, pid_t pid , const char *name,
                int is_open)
 {
        int ret;
 
-       /* Open element pid */
-       ret = mi_lttng_writer_open_element(writer, mi_lttng_element_pid);
+       /* Open pid process */
+       ret = mi_lttng_writer_open_element(writer, config_element_pid);
        if (ret) {
                goto end;
        }
@@ -1145,15 +1194,62 @@ int mi_lttng_pid(struct mi_writer *writer, pid_t pid , const char *cmdline,
        }
 
        /* Writing name of the process */
-       ret = mi_lttng_writer_write_element_string(writer, config_element_name,
-                       cmdline);
+       if (name) {
+               ret = mi_lttng_writer_write_element_string(writer, config_element_name,
+                               name);
+               if (ret) {
+                       goto end;
+               }
+       }
+
+       if (!is_open) {
+               /* Closing Pid */
+               ret = mi_lttng_writer_close_element(writer);
+       }
+
+end:
+       return ret;
+}
+
+LTTNG_HIDDEN
+int mi_lttng_targets_open(struct mi_writer *writer)
+{
+       return mi_lttng_writer_open_element(writer,
+                       config_element_targets);
+}
+
+LTTNG_HIDDEN
+int mi_lttng_pid_target(struct mi_writer *writer, pid_t pid, int is_open)
+{
+       int ret;
+
+       ret = mi_lttng_writer_open_element(writer,
+                       config_element_target_pid);
+       if (ret) {
+               goto end;
+       }
+
+       /* Writing pid number
+        * Special case for element all on track untrack command
+        * All pid is represented as wildcard *
+        */
+       if ((int) pid == -1) {
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_pid,
+                               mi_lttng_element_track_untrack_all_wildcard);
+       } else {
+               ret = mi_lttng_writer_write_element_signed_int(writer,
+                               config_element_pid, (int) pid);
+       }
        if (ret) {
                goto end;
        }
 
        if (!is_open) {
-               /* Closing Pid */
                ret = mi_lttng_writer_close_element(writer);
+               if (ret) {
+                       goto end;
+               }
        }
 
 end:
@@ -1241,8 +1337,6 @@ end:
        return ret;
 }
 
-/* TODO: mi tracker */
-
 LTTNG_HIDDEN
 int mi_lttng_context(struct mi_writer *writer,
                struct lttng_event_context *context, int is_open)