Fix: load event state (enabled/disabled) correctly

This bug fix is a workaround due to limitations of lttng_disable_event_ext
regarding the disabling of events with similar name but different
characteristics. Although lttng_disable_event_ext provides support for
disabling by name and filter string it does not support exclusion.

The loading of events is cut in 3 phases.

1 - Create all events regardless of their state.
2 - Disable all events.
3 - Enable only the events with the 'enabled' state.

Fixes #959

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/common/config/config.c b/src/common/config/config.c
index 0253d58d3d9bedb55c7299ae0aa4eb57a8b7e6e2..d12763872a3b8f26bb0c133fb4d7a61e825e9416 100644 (file)
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -168,6 +168,11 @@ const char * const config_event_context_hostname = "HOSTNAME";
 const char * const config_event_context_ip = "IP";
 const char * const config_event_context_perf_thread_counter = "PERF_THREAD_COUNTER";
 
+enum process_event_node_phase {
+       CREATION = 0,
+       ENABLE = 1,
+};
+
 struct consumer_output {
        int enabled;
        char *path;
@@ -1413,9 +1418,9 @@ end:
 
 static
 int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
-       const char *channel_name)
+       const char *channel_name, const enum process_event_node_phase phase)
 {
-       int ret, i;
+       int ret = 0, i;
        xmlNodePtr node;
        struct lttng_event event;
        char **exclusions = NULL;
@@ -1667,25 +1672,14 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
                }
        }
 
-       ret = lttng_enable_event_with_exclusions(handle, &event, channel_name,
-                       filter_expression, exclusion_count, exclusions);
-       if (ret) {
-               goto end;
-       }
-
-       if (!event.enabled) {
-               /*
-                * Note that we should use lttng_disable_event_ext() (2.6+) to
-                * eliminate the risk of clashing on events of the same
-                * name (with different event types and loglevels).
-                *
-                * Unfortunately, lttng_disable_event_ext() only performs a
-                * match on the name and event type and errors out if any other
-                * event attribute is not set to its default value.
-                *
-                * This will disable all events that match this name.
-                */
-               ret = lttng_disable_event(handle, event.name, channel_name);
+       if ((event.enabled && phase == ENABLE) || phase == CREATION) {
+               ret = lttng_enable_event_with_exclusions(handle, &event, channel_name,
+                               filter_expression, exclusion_count, exclusions);
+               if (ret < 0) {
+                       WARN("Enabling event (name:%s) on load failed.", event.name);
+                       ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+                       goto end;
+               }
        }
 end:
        for (i = 0; i < exclusion_count; i++) {
@@ -1702,6 +1696,7 @@ int process_events_node(xmlNodePtr events_node, struct lttng_handle *handle,
        const char *channel_name)
 {
        int ret = 0;
+       struct lttng_event event;
        xmlNodePtr node;
 
        assert(events_node);
@@ -1710,11 +1705,33 @@ int process_events_node(xmlNodePtr events_node, struct lttng_handle *handle,
 
        for (node = xmlFirstElementChild(events_node); node;
                node = xmlNextElementSibling(node)) {
-               ret = process_event_node(node, handle, channel_name);
+               ret = process_event_node(node, handle, channel_name, CREATION);
                if (ret) {
                        goto end;
                }
        }
+
+       /*
+        * Disable all events to enable only the necessary events.
+        * Limitations regarding lttng_disable_events and tuple descriptor
+        * force this approach.
+        */
+       memset(&event, 0, sizeof(event));
+       event.loglevel = -1;
+       event.type = LTTNG_EVENT_ALL;
+       ret = lttng_disable_event_ext(handle, &event, channel_name, NULL);
+       if (ret) {
+               goto end;
+       }
+
+       for (node = xmlFirstElementChild(events_node); node;
+                       node = xmlNextElementSibling(node)) {
+               ret = process_event_node(node, handle, channel_name, ENABLE);
+               if (ret) {
+                       goto end;
+               }
+       }
+
 end:
        return ret;
 }