X-Git-Url: http://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=a1891d805e801e19599c69a4d22374465ff62498;hp=3a899775dcb62f15f75964626932cc535a570a71;hb=b69a1b4064e50db1192d79fd92305182cfc5829e;hpb=746e08d773ef6c7bbbae1334350b8a2c46aaeb0e

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 3a899775d..a1891d805 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -4314,16 +4314,12 @@ void ust_app_clean_list(void)
 	if (ust_app_ht_by_notify_sock) {
 		cds_lfht_for_each_entry(ust_app_ht_by_notify_sock->ht, &iter.iter, app,
 				notify_sock_n.node) {
-			struct cds_lfht_node *node;
-			struct ust_app *app;
-
-			node = cds_lfht_iter_get_node(&iter.iter);
-			if (!node) {
-				continue;
-			}
+			/*
+			 * Assert that all notifiers are gone as all triggers
+			 * are unregistered prior to this clean-up.
+			 */
+			assert(lttng_ht_get_count(app->token_to_event_notifier_rule_ht) == 0);
 
-			app = container_of(node, struct ust_app,
-					notify_sock_n.node);
 			ust_app_notify_sock_unregister(app->notify_sock);
 		}
 	}