From: David Goulet <dgoulet@efficios.com>
Date: Mon, 10 Dec 2012 21:27:55 +0000 (-0500)
Subject: Fix: Add missing relayd ht cleanup and ht destroy
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=228b5bf7fa0bd5cf9e709717e578e28bccd57a73;hp=04bb2b6422d74dd96498fbdda5fce5cc42cb2f4a;p=lttng-tools.git

Fix: Add missing relayd ht cleanup and ht destroy

Add a function to cleanup every element of the relayd ht and free them
in a call_rcu.

Also, destroy the stream_list_ht on cleanup.

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

diff --git a/src/common/consumer.c b/src/common/consumer.c
index c561b9bd2..70cde9c10 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -234,6 +234,27 @@ static void destroy_relayd(struct consumer_relayd_sock_pair *relayd)
 	call_rcu(&relayd->node.head, consumer_rcu_free_relayd);
 }
 
+/*
+ * Iterate over the relayd hash table and destroy each element. Finally,
+ * destroy the whole hash table.
+ */
+static void cleanup_relayd_ht(void)
+{
+	struct lttng_ht_iter iter;
+	struct consumer_relayd_sock_pair *relayd;
+
+	rcu_read_lock();
+
+	cds_lfht_for_each_entry(consumer_data.relayd_ht->ht, &iter.iter, relayd,
+			node.node) {
+		destroy_relayd(relayd);
+	}
+
+	lttng_ht_destroy(consumer_data.relayd_ht);
+
+	rcu_read_unlock();
+}
+
 /*
  * Update the end point status of all streams having the given network sequence
  * index (relayd index).
@@ -1003,8 +1024,8 @@ int lttng_consumer_send_error(
 }
 
 /*
- * Close all the tracefiles and stream fds, should be called when all instances
- * are destroyed.
+ * Close all the tracefiles and stream fds and MUST be called when all
+ * instances are destroyed i.e. when all threads were joined and are ended.
  */
 void lttng_consumer_cleanup(void)
 {
@@ -1023,6 +1044,15 @@ void lttng_consumer_cleanup(void)
 	rcu_read_unlock();
 
 	lttng_ht_destroy(consumer_data.channel_ht);
+
+	cleanup_relayd_ht();
+
+	/*
+	 * This HT contains streams that are freed by either the metadata thread or
+	 * the data thread so we do *nothing* on the hash table and simply destroy
+	 * it.
+	 */
+	lttng_ht_destroy(consumer_data.stream_list_ht);
 }
 
 /*