MI: Remove boolean "exclusion" element

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

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index e2a5917e9c6a22fd09ddba5ba75c282c05112ff4..72b0791527eddf25ba89fb1a7ed4b27197fc9101 100644 (file)
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -19,6 +19,7 @@
 
 #define _LGPL_SOURCE
 #include <common/config/session-config.h>
+#include <common/defaults.h>
 #include <lttng/snapshot-internal.h>
 #include "mi-lttng.h"
 
@@ -29,12 +30,11 @@
 
 /* Machine interface namespace URI */
 const char * const mi_lttng_xmlns = "xmlns";
-const char * const mi_lttng_ns_uri = "http://lttng.org/xml/ns/lttng-mi";
 const char * const mi_lttng_xmlns_xsi = "xmlns:xsi";
 const char * const mi_lttng_w3_schema_uri = "http://www.w3.org/2001/XMLSchema-instance";
 const char * const mi_lttng_schema_location = "xsi:schemaLocation";
 const char * const mi_lttng_schema_location_uri =
-       "http://lttng.org/xml/ns/lttng-mi" " "
+       DEFAULT_LTTNG_MI_NAMESPACE " "
        "http://lttng.org/xml/schemas/lttng-mi/" XSTR(MI_SCHEMA_MAJOR_VERSION)
        "/lttng-mi-" XSTR(MI_SCHEMA_MAJOR_VERSION) "."
        XSTR(MI_SCHEMA_MINOR_VERSION) ".xsd";
@@ -506,7 +506,7 @@ int mi_lttng_writer_command_open(struct mi_writer *writer, const char *command)
        }
 
        ret = config_writer_write_attribute(writer->writer,
-                       mi_lttng_xmlns, mi_lttng_ns_uri);
+                       mi_lttng_xmlns, DEFAULT_LTTNG_MI_NAMESPACE);
        if (ret) {
                goto end;
        }
@@ -1010,6 +1010,51 @@ end:
        return ret;
 }
 
+static int write_event_exclusions(struct mi_writer *writer,
+               struct lttng_event *event)
+{
+       int i;
+       int ret;
+       int exclusion_count;
+
+       /* Open event exclusions */
+       ret = mi_lttng_writer_open_element(writer, config_element_exclusions);
+       if (ret) {
+               goto end;
+       }
+
+       exclusion_count = lttng_event_get_exclusion_name_count(event);
+       if (exclusion_count < 0) {
+               ret = exclusion_count;
+               goto end;
+       }
+
+       for (i = 0; i < exclusion_count; i++) {
+               const char *name;
+
+               ret = lttng_event_get_exclusion_name(event, i, &name);
+               if (ret) {
+                       /* Close exclusions */
+                       mi_lttng_writer_close_element(writer);
+                       goto end;
+               }
+
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_exclusion, name);
+               if (ret) {
+                       /* Close exclusions */
+                       mi_lttng_writer_close_element(writer);
+                       goto end;
+               }
+       }
+
+       /* Close exclusions */
+       ret = mi_lttng_writer_close_element(writer);
+
+end:
+       return ret;
+}
+
 LTTNG_HIDDEN
 int mi_lttng_event_tracepoint_loglevel(struct mi_writer *writer,
                struct lttng_event *event, enum lttng_domain_type domain)
@@ -1032,12 +1077,8 @@ int mi_lttng_event_tracepoint_loglevel(struct mi_writer *writer,
                goto end;
        }
 
-       /* event exclusion filter */
-       ret = mi_lttng_writer_write_element_bool(writer,
-                       config_element_exclusion, event->exclusion);
-       if (ret) {
-               goto end;
-       }
+       /* Event exclusions */
+       ret = write_event_exclusions(writer, event);
 
 end:
        return ret;
@@ -1048,8 +1089,7 @@ int mi_lttng_event_tracepoint_no_loglevel(struct mi_writer *writer,
                struct lttng_event *event)
 {
        /* event exclusion filter */
-       return mi_lttng_writer_write_element_bool(writer,
-                       config_element_exclusion, event->exclusion);
+       return write_event_exclusions(writer, event);
 }
 
 LTTNG_HIDDEN