X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=03e6b91611ad0732fa82faf0c386c252cf0ca4c5;hb=8273250bde9f8fa0cc2f6d8ea86aaf4b9fe83fc1;hp=bb136a022eb12b0862aaa336fe9811db3aab51df;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9;p=lttng-tools.git

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index bb136a022..03e6b9161 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -24,11 +24,14 @@
 #include <unistd.h>
 #include <time.h>
 #include <sys/types.h>
+#include <urcu.h>
 
 #include <tap/tap.h>
 
 #include <bin/lttng-sessiond/session.h>
 #include <bin/lttng-sessiond/ust-app.h>
+#include <bin/lttng-sessiond/ht-cleanup.h>
+#include <bin/lttng-sessiond/health-sessiond.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/common.h>
 
@@ -40,7 +43,9 @@
 /* Number of TAP tests in this file */
 #define NUM_TESTS 11
 
+struct health_app *health_sessiond;
 static struct ltt_session_list *session_list;
+static pthread_t ht_cleanup_thread;
 
 /* For error.h */
 int lttng_opt_quiet = 1;
@@ -108,8 +113,7 @@ static void empty_session_list(void)
 	struct ltt_session *iter, *tmp;
 
 	cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
-		cds_list_del(&iter->list);
-		free(iter);
+		session_destroy(iter);
 	}
 
 	/* Session list must be 0 */
@@ -294,8 +298,13 @@ int main(int argc, char **argv)
 {
 	plan_tests(NUM_TESTS);
 
+	health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
+	assert(!init_ht_cleanup_thread(&ht_cleanup_thread));
+
 	diag("Sessions unit tests");
 
+	rcu_register_thread();
+
 	test_session_list();
 
 	test_create_one_session();
@@ -312,5 +321,8 @@ int main(int argc, char **argv)
 
 	test_large_session_number();
 
+	rcu_unregister_thread();
+	assert(!fini_ht_cleanup_thread(&ht_cleanup_thread));
+
 	return exit_status();
 }