From: Jérémie Galarneau Date: Fri, 28 Nov 2014 16:07:17 +0000 (-0500) Subject: Fix: Don't leave events enabled if they were saved in a disabled state X-Git-Tag: v2.5.3~5 X-Git-Url: http://git.liburcu.org/?p=lttng-tools.git;a=commitdiff_plain;h=17a2eba9827b0985e0e213109298e60ff869ba60 Fix: Don't leave events enabled if they were saved in a disabled state Events are enabled by default on creation. The session configuration loader must make sure to disable them after creation when restoring an event that was saved in the "disabled" state. Reported-by: Marcel Hamer Signed-off-by: Jérémie Galarneau --- diff --git a/src/common/config/config.c b/src/common/config/config.c index bfb2576f4..e5c1da132 100644 --- a/src/common/config/config.c +++ b/src/common/config/config.c @@ -1632,6 +1632,24 @@ 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); + } end: for (i = 0; i < exclusion_count; i++) { free(exclusions[i]);