X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=cfbb52d048dd00820e6817a24dbe221a5a165716;hp=61db187f1ccff351e93cee8c08297fcefac31639;hb=a9577b7628a85b064c3f249c3504bad989848b49;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index 61db187f1..cfbb52d04 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -25,30 +24,33 @@
 #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>
 
 #define SESSION1 "test1"
 
-/* This path will NEVER be created in this test */
-#define PATH1 "/tmp/.test-junk-lttng"
-
 #define MAX_SESSIONS 10000
 #define RANDOM_STRING_LEN	11
 
 /* Number of TAP tests in this file */
-#define NUM_TESTS 12
+#define NUM_TESTS 11
 
+struct health_app *health_sessiond;
 static struct ltt_session_list *session_list;
+static pthread_t ht_cleanup_thread;
 
-/* For lttngerr.h */
+/* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 0;
+int lttng_opt_mi;
 
 int ust_consumerd32_fd;
 int ust_consumerd64_fd;
@@ -111,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 */
@@ -122,11 +123,11 @@ static void empty_session_list(void)
 /*
  * Test creation of 1 session
  */
-static int create_one_session(char *name, char *path)
+static int create_one_session(char *name)
 {
 	int ret;
 
-	ret = session_create(name, path, geteuid(), getegid());
+	ret = session_create(name, geteuid(), getegid());
 	if (ret == LTTNG_OK) {
 		/* Validate */
 		ret = find_session_name(name);
@@ -154,15 +155,14 @@ static int create_one_session(char *name, char *path)
 static int destroy_one_session(struct ltt_session *session)
 {
 	int ret;
+	char session_name[NAME_MAX];
 
-	ret = session_destroy(session);
+	strncpy(session_name, session->name, sizeof(session_name));
+	session_name[sizeof(session_name) - 1] = '\0';
 
+	ret = session_destroy(session);
 	if (ret == LTTNG_OK) {
-		/* Validate */
-		if (session == NULL) {
-			return 0;
-		}
-		ret = find_session_name(session->name);
+		ret = find_session_name(session_name);
 		if (ret < 0) {
 			/* Success, -1 means that the sesion is NOT found */
 			return 0;
@@ -184,7 +184,7 @@ static int two_session_same_name(void)
 	int ret;
 	struct ltt_session *sess;
 
-	ret = create_one_session(SESSION1, PATH1);
+	ret = create_one_session(SESSION1);
 	if (ret < 0) {
 		/* Fail */
 		return -1;
@@ -208,7 +208,7 @@ void test_session_list(void)
 
 void test_create_one_session(void)
 {
-	ok(create_one_session(SESSION1, PATH1) == 0,
+	ok(create_one_session(SESSION1) == 0,
 	   "Create session: %s",
 	   SESSION1);
 }
@@ -223,7 +223,6 @@ void test_validate_session(void)
 	   "Validating session: session found");
 
 	ok(tmp->kernel_session == NULL &&
-	   strlen(tmp->path) &&
 	   strlen(tmp->name),
 	   "Validating session: basic sanity check");
 
@@ -253,12 +252,8 @@ void test_duplicate_session(void)
 
 void test_bogus_session_param(void)
 {
-	ok(create_one_session(NULL, NULL) < 0,
-	   "Create session with bogus param: NULL, NULL should fail");
-
-	ok(create_one_session(NULL, PATH1) < 0,
-	   "Create session with bogus param: NULL, %s should fail",
-	   PATH1);
+	ok(create_one_session(NULL) < 0,
+	   "Create session with bogus param: NULL should fail");
 
 	ok(session_list_count() == 0,
 	   "Create session with bogus param: session list empty");
@@ -271,7 +266,7 @@ void test_large_session_number(void)
 
 	for (i = 0; i < MAX_SESSIONS; i++) {
 		char *tmp_name = get_random_string();
-		ret = create_one_session(tmp_name, PATH1);
+		ret = create_one_session(tmp_name);
 		if (ret < 0) {
 			diag("session %d (name: %s) creation failed", i, tmp_name);
 			++failed;
@@ -288,7 +283,7 @@ void test_large_session_number(void)
 		cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
 			ret = destroy_one_session(iter);
 			if (ret < 0) {
-				diag("session %d (name: %s) destroy failed", i, iter->name);
+				diag("session %d destroy failed", i);
 				++failed;
 			}
 		}
@@ -303,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();
@@ -321,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();
 }