X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=024ee17853c03c053dfa0ae4382a7e3763346b1f;hb=3fa5d621da48eaeedaa1bc49fcf093d1c9b0d196;hp=ee5575262ec5667d448007a8ab82eec0607e19c9;hpb=5a4b955ed97bb0802977e50f1aa409f0bb4729ec;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index ee5575262..024ee1785 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -636,6 +636,9 @@ void lttng_consumer_cleanup(void)
 	}
 
 	rcu_read_unlock();
+
+	lttng_ht_destroy(consumer_data.stream_ht);
+	lttng_ht_destroy(consumer_data.channel_ht);
 }
 
 /*
@@ -1218,8 +1221,12 @@ void *lttng_consumer_thread_receive_fds(void *data)
 			DBG("Received STOP command");
 			goto end;
 		}
-		if (ret < 0) {
-			ERR("Communication interrupted on command socket");
+		if (ret <= 0) {
+			/*
+			 * This could simply be a session daemon quitting. Don't output
+			 * ERR() here.
+			 */
+			DBG("Communication interrupted on command socket");
 			goto end;
 		}
 		if (consumer_quit) {