X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.cpp;h=14de5468c7979f523cd98d0504e3fed70d54764c;hb=c9753f7250f33184a1859088a691291f37161f25;hp=fbf8ce55c0b1c1d2e25c26688a09c9f0b0270cfd;hpb=21cf9b6b1843774306a76f4dccddddd706b64f79;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/session.cpp b/src/bin/lttng-sessiond/session.cpp
index fbf8ce55c..14de5468c 100644
--- a/src/bin/lttng-sessiond/session.cpp
+++ b/src/bin/lttng-sessiond/session.cpp
@@ -331,12 +331,12 @@ end:
 static void ltt_sessions_ht_destroy(void)
 {
 	if (ltt_sessions_ht_by_id) {
-		ht_cleanup_push(ltt_sessions_ht_by_id);
+		lttng_ht_destroy(ltt_sessions_ht_by_id);
 		ltt_sessions_ht_by_id = NULL;
 	}
 
 	if (ltt_sessions_ht_by_name) {
-		ht_cleanup_push(ltt_sessions_ht_by_name);
+		lttng_ht_destroy(ltt_sessions_ht_by_name);
 		ltt_sessions_ht_by_name = NULL;
 	}
 
@@ -1143,6 +1143,7 @@ struct ltt_session *session_find_by_id(uint64_t id)
 	struct lttng_ht_iter iter;
 	struct ltt_session *ls;
 
+	ASSERT_RCU_READ_LOCKED();
 	ASSERT_LOCKED(ltt_session_list.lock);
 
 	if (!ltt_sessions_ht_by_id) {