X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=991b1dca3de4e71d69d038bab9469bbef402af6c;hp=74643221c6aa4b93e7d41a63398a9e5b6946bf4b;hb=d61d06f0e7d348674e8b63e350a04ab852968561;hpb=e32d7f274604b77bcd83c24994e88df3761ed658

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index 74643221c..991b1dca3 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -32,6 +32,7 @@
 #include <bin/lttng-sessiond/ust-app.h>
 #include <bin/lttng-sessiond/ht-cleanup.h>
 #include <bin/lttng-sessiond/health-sessiond.h>
+#include <bin/lttng-sessiond/thread.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/common.h>
 
@@ -45,7 +46,6 @@
 
 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;
@@ -128,27 +128,36 @@ static void empty_session_list(void)
 static int create_one_session(char *name)
 {
 	int ret;
+	enum lttng_error_code ret_code;
+	struct ltt_session *session = NULL;
 
-	ret = session_create(name, geteuid(), getegid());
-	if (ret == LTTNG_OK) {
+	session_lock_list();
+	ret_code = session_create(name, geteuid(), getegid(), &session);
+	session_put(session);
+	if (ret_code == LTTNG_OK) {
 		/* Validate */
 		ret = find_session_name(name);
 		if (ret < 0) {
 			/* Session not found by name */
 			printf("session not found after creation\n");
-			return -1;
+			ret = -1;
+			goto end;
 		} else {
 			/* Success */
-			return 0;
+			ret = 0;
+			goto end;
 		}
 	} else {
-		if (ret == LTTNG_ERR_EXIST_SESS) {
+		if (ret_code == LTTNG_ERR_EXIST_SESS) {
 			printf("(session already exists) ");
 		}
-		return -1;
+		ret = -1;
+		goto end;
 	}
-
-	return 0;
+	ret = 0;
+end:
+	session_unlock_list();
+	return ret;
 }
 
 /*
@@ -234,13 +243,19 @@ void test_validate_session(void)
 	ok(tmp != NULL,
 	   "Validating session: session found");
 
-	ok(tmp->kernel_session == NULL &&
-	   strlen(tmp->name),
-	   "Validating session: basic sanity check");
+	if (tmp) {
+		ok(tmp->kernel_session == NULL &&
+		   strlen(tmp->name),
+		   "Validating session: basic sanity check");
+	} else {
+		skip(1, "Skipping session validation check as session was not found");
+		goto end;
+	}
 
 	session_lock(tmp);
 	session_unlock(tmp);
 	session_put(tmp);
+end:
 	session_unlock_list();
 }
 
@@ -266,13 +281,29 @@ void test_duplicate_session(void)
 	   "Duplicate session creation");
 }
 
-void test_bogus_session_param(void)
+void test_session_name_generation(void)
 {
-	ok(create_one_session(NULL) < 0,
-	   "Create session with bogus param: NULL should fail");
+	struct ltt_session *session = NULL;
+	enum lttng_error_code ret_code;
+	const char *expected_session_name_prefix = DEFAULT_SESSION_NAME;
 
-	ok(session_list_count() == 0,
-	   "Create session with bogus param: session list empty");
+	session_lock_list();
+	ret_code = session_create(NULL, geteuid(), getegid(), &session);
+	ok(ret_code == LTTNG_OK,
+		"Create session with a NULL name (auto-generate a name)");
+	if (!session) {
+		skip(1, "Skipping session name generation tests as session_create() failed.");
+		goto end;
+	}
+	diag("Automatically-generated session name: %s", *session->name ?
+		session->name : "ERROR");
+	ok(*session->name && !strncmp(expected_session_name_prefix, session->name,
+			sizeof(DEFAULT_SESSION_NAME) - 1),
+			"Auto-generated session name starts with %s",
+			DEFAULT_SESSION_NAME);
+end:
+	session_put(session);
+	session_unlock_list();
 }
 
 void test_large_session_number(void)
@@ -315,10 +346,14 @@ void test_large_session_number(void)
 
 int main(int argc, char **argv)
 {
+	struct lttng_thread *ht_cleanup_thread;
+
 	plan_tests(NUM_TESTS);
 
 	health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
-	assert(!init_ht_cleanup_thread(&ht_cleanup_thread));
+	ht_cleanup_thread = launch_ht_cleanup_thread();
+	assert(ht_cleanup_thread);
+	lttng_thread_put(ht_cleanup_thread);
 
 	diag("Sessions unit tests");
 
@@ -336,12 +371,12 @@ int main(int argc, char **argv)
 
 	empty_session_list();
 
-	test_bogus_session_param();
+	test_session_name_generation();
 
 	test_large_session_number();
 
 	rcu_unregister_thread();
-	assert(!fini_ht_cleanup_thread(&ht_cleanup_thread));
+	lttng_thread_list_shutdown_orphans();
 
 	return exit_status();
 }