X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_session.cpp;h=f6e58c8cb48cae044539d0310a78814b58745c90;hb=cd9adb8b829564212158943a0d279bb35322ab30;hp=ee0549906b5f051fbba61b78586642f974930248;hpb=21cf9b6b1843774306a76f4dccddddd706b64f79;p=lttng-tools.git

diff --git a/tests/unit/test_session.cpp b/tests/unit/test_session.cpp
index ee0549906..f6e58c8cb 100644
--- a/tests/unit/test_session.cpp
+++ b/tests/unit/test_session.cpp
@@ -5,46 +5,43 @@
  *
  */
 
+#include <common/common.hpp>
+#include <common/compat/errno.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+
+#include <bin/lttng-sessiond/health-sessiond.hpp>
+#include <bin/lttng-sessiond/session.hpp>
+#include <bin/lttng-sessiond/thread.hpp>
+#include <bin/lttng-sessiond/ust-app.hpp>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <time.h>
 #include <sys/types.h>
-#include <urcu.h>
-
 #include <tap/tap.h>
-
-#include <common/compat/errno.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 <bin/lttng-sessiond/thread.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/common.h>
+#include <time.h>
+#include <unistd.h>
+#include <urcu.h>
 
 #define SESSION1 "test1"
 
-#define MAX_SESSIONS 10000
-#define RANDOM_STRING_LEN	11
+#define MAX_SESSIONS	  10000
+#define RANDOM_STRING_LEN 11
 
 /* Number of TAP tests in this file */
 #define NUM_TESTS 11
 
 static struct ltt_session_list *session_list;
 
-static const char alphanum[] =
-	"0123456789"
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	"abcdefghijklmnopqrstuvwxyz";
+static const char alphanum[] = "0123456789"
+			       "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			       "abcdefghijklmnopqrstuvwxyz";
 static char random_string[RANDOM_STRING_LEN];
 
 /*
  * Return random string of 10 characters.
  * Not thread-safe.
  */
-static char *get_random_string(void)
+static char *get_random_string()
 {
 	int i;
 
@@ -64,7 +61,7 @@ static int find_session_name(const char *name)
 {
 	struct ltt_session *iter;
 
-	cds_list_for_each_entry(iter, &session_list->head, list) {
+	cds_list_for_each_entry (iter, &session_list->head, list) {
 		if (strcmp(iter->name, name) == 0) {
 			return 0;
 		}
@@ -73,12 +70,12 @@ static int find_session_name(const char *name)
 	return -1;
 }
 
-static int session_list_count(void)
+static int session_list_count()
 {
 	int count = 0;
 	struct ltt_session *iter;
 
-	cds_list_for_each_entry(iter, &session_list->head, list) {
+	cds_list_for_each_entry (iter, &session_list->head, list) {
 		count++;
 	}
 	return count;
@@ -87,12 +84,12 @@ static int session_list_count(void)
 /*
  * Empty session list manually.
  */
-static void empty_session_list(void)
+static void empty_session_list()
 {
 	struct ltt_session *iter, *tmp;
 
 	session_lock_list();
-	cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
+	cds_list_for_each_entry_safe (iter, tmp, &session_list->head, list) {
 		session_destroy(iter);
 	}
 	session_unlock_list();
@@ -108,7 +105,7 @@ static int create_one_session(const char *name)
 {
 	int ret;
 	enum lttng_error_code ret_code;
-	struct ltt_session *session = NULL;
+	struct ltt_session *session = nullptr;
 
 	session_lock_list();
 	ret_code = session_create(name, geteuid(), getegid(), &session);
@@ -164,7 +161,7 @@ static int destroy_one_session(struct ltt_session *session)
  * This test is supposed to fail at the second create call. If so, return 0 for
  * test success, else -1.
  */
-static int two_session_same_name(void)
+static int two_session_same_name()
 {
 	int ret;
 	struct ltt_session *sess;
@@ -195,32 +192,28 @@ end:
 	return ret;
 }
 
-static void test_session_list(void)
+static void test_session_list()
 {
 	session_list = session_get_list();
-	ok(session_list != NULL, "Session list: not NULL");
+	ok(session_list != nullptr, "Session list: not NULL");
 }
 
-static void test_create_one_session(void)
+static void test_create_one_session()
 {
-	ok(create_one_session(SESSION1) == 0,
-	   "Create session: %s",
-	   SESSION1);
+	ok(create_one_session(SESSION1) == 0, "Create session: %s", SESSION1);
 }
 
-static void test_validate_session(void)
+static void test_validate_session()
 {
 	struct ltt_session *tmp;
 
 	session_lock_list();
 	tmp = session_find_by_name(SESSION1);
 
-	ok(tmp != NULL,
-	   "Validating session: session found");
+	ok(tmp != nullptr, "Validating session: session found");
 
 	if (tmp) {
-		ok(tmp->kernel_session == NULL &&
-		   strlen(tmp->name),
+		ok(tmp->kernel_session == nullptr && strlen(tmp->name),
 		   "Validating session: basic sanity check");
 	} else {
 		skip(1, "Skipping session validation check as session was not found");
@@ -234,58 +227,54 @@ end:
 	session_unlock_list();
 }
 
-static void test_destroy_session(void)
+static void test_destroy_session()
 {
 	struct ltt_session *tmp;
 
 	session_lock_list();
 	tmp = session_find_by_name(SESSION1);
 
-	ok(tmp != NULL,
-	   "Destroying session: session found");
+	ok(tmp != nullptr, "Destroying session: session found");
 
 	if (tmp) {
-		ok(destroy_one_session(tmp) == 0,
-		   "Destroying session: %s destroyed",
-		   SESSION1);
+		ok(destroy_one_session(tmp) == 0, "Destroying session: %s destroyed", SESSION1);
 	} else {
 		skip(1, "Skipping session destruction as it was not found");
 	}
 	session_unlock_list();
 }
 
-static void test_duplicate_session(void)
+static void test_duplicate_session()
 {
-	ok(two_session_same_name() == 0,
-	   "Duplicate session creation");
+	ok(two_session_same_name() == 0, "Duplicate session creation");
 }
 
-static void test_session_name_generation(void)
+static void test_session_name_generation()
 {
-	struct ltt_session *session = NULL;
+	struct ltt_session *session = nullptr;
 	enum lttng_error_code ret_code;
 	const char *expected_session_name_prefix = DEFAULT_SESSION_NAME;
 
 	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)");
+	ret_code = session_create(nullptr, 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);
+	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();
 }
 
-static void test_large_session_number(void)
+static void test_large_session_number()
 {
 	int ret, i, failed = 0;
 	struct ltt_session *iter, *tmp;
@@ -299,15 +288,13 @@ static void test_large_session_number(void)
 		}
 	}
 
-	ok(failed == 0,
-	   "Large sessions number: created %u sessions",
-	   MAX_SESSIONS);
+	ok(failed == 0, "Large sessions number: created %u sessions", MAX_SESSIONS);
 
 	failed = 0;
 
 	session_lock_list();
 	for (i = 0; i < MAX_SESSIONS; i++) {
-		cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
+		cds_list_for_each_entry_safe (iter, tmp, &session_list->head, list) {
 			LTTNG_ASSERT(session_get(iter));
 			ret = destroy_one_session(iter);
 			if (ret < 0) {
@@ -323,16 +310,11 @@ static void test_large_session_number(void)
 	   MAX_SESSIONS);
 }
 
-int main(int argc, char **argv)
+int main()
 {
-	struct lttng_thread *ht_cleanup_thread;
-
 	plan_tests(NUM_TESTS);
 
 	the_health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
-	ht_cleanup_thread = launch_ht_cleanup_thread();
-	LTTNG_ASSERT(ht_cleanup_thread);
-	lttng_thread_put(ht_cleanup_thread);
 
 	diag("Sessions unit tests");