X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=a53b7383ec170b279211609043385c8104c6d861;hp=82be751c40ef82e83e47e10e785caa0d131cffbe;hb=e10aec8f225c0822811c65401710a039d7e2d7d7;hpb=590f0324d6dfd382f79229a7934fa8b5b661641f

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 82be751c4..a53b7383e 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1408,6 +1408,7 @@ void lttng_consumer_cleanup(void)
 {
 	struct lttng_ht_iter iter;
 	struct lttng_consumer_channel *channel;
+	unsigned int trace_chunks_left;
 
 	rcu_read_lock();
 
@@ -1432,6 +1433,27 @@ void lttng_consumer_cleanup(void)
 	 */
 	lttng_ht_destroy(consumer_data.stream_list_ht);
 
+	/*
+	 * Trace chunks in the registry may still exist if the session
+	 * daemon has encountered an internal error and could not
+	 * tear down its sessions and/or trace chunks properly.
+	 *
+	 * Release the session daemon's implicit reference to any remaining
+	 * trace chunk and print an error if any trace chunk was found. Note
+	 * that there are _no_ legitimate cases for trace chunks to be left,
+	 * it is a leak. However, it can happen following a crash of the
+	 * session daemon and not emptying the registry would cause an assertion
+	 * to hit.
+	 */
+	trace_chunks_left = lttng_trace_chunk_registry_put_each_chunk(
+			consumer_data.chunk_registry);
+	if (trace_chunks_left) {
+		ERR("%u trace chunks are leaked by lttng-consumerd. "
+				"This can be caused by an internal error of the session daemon.",
+				trace_chunks_left);
+	}
+	/* Run all callbacks freeing each chunk. */
+	rcu_barrier();
 	lttng_trace_chunk_registry_destroy(consumer_data.chunk_registry);
 }