From: David Goulet <dgoulet@efficios.com>
Date: Tue, 29 Jul 2014 18:11:48 +0000 (-0400)
Subject: Fix: disable JUL event on destroy
X-Git-Tag: v2.5.1~12
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=3f09f57d2e38937f40a93338f6e95b1568413ea3;p=lttng-tools.git

Fix: disable JUL event on destroy

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/jul.c b/src/bin/lttng-sessiond/jul.c
index 99e07487b..bf4669b23 100644
--- a/src/bin/lttng-sessiond/jul.c
+++ b/src/bin/lttng-sessiond/jul.c
@@ -876,6 +876,15 @@ void jul_destroy_domain(struct jul_domain *dom)
 	rcu_read_lock();
 	cds_lfht_for_each_entry(dom->events->ht, &iter.iter, node, node) {
 		int ret;
+		struct jul_event *event;
+
+		/*
+		 * When destroying an event, we have to try to disable it on the agent
+		 * side so the event stops generating data. The return value is not
+		 * important since we have to continue anyway destroying the object.
+		 */
+		event = caa_container_of(node, struct jul_event, node);
+		(void) jul_disable_event(event);
 
 		ret = lttng_ht_del(dom->events, &iter);
 		assert(!ret);