From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 2 Jul 2013 20:20:33 +0000 (-0400)
Subject: Fix: UST per-UID channels persist across application teardown
X-Git-Tag: v2.2.1~10
X-Git-Url: https://git.liburcu.org/?p=lttng-tools.git;a=commitdiff_plain;h=5894f2c8a0c04285894562834eac18839e644954

Fix: UST per-UID channels persist across application teardown

Fixes #582

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index eea0d8c03..4dcaf4ffb 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -377,10 +377,12 @@ void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan,
 		delete_ust_app_event(sock, ua_event);
 	}
 
-	/* Wipe and free registry from session registry. */
-	registry = get_session_registry(ua_chan->session);
-	if (registry) {
-		ust_registry_channel_del_free(registry, ua_chan->key);
+	if (ua_chan->session->buffer_type == LTTNG_BUFFER_PER_PID) {
+		/* Wipe and free registry from session registry. */
+		registry = get_session_registry(ua_chan->session);
+		if (registry) {
+			ust_registry_channel_del_free(registry, ua_chan->key);
+		}
 	}
 
 	if (ua_chan->obj != NULL) {