X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fht-cleanup.c;h=09c13fe003d7d40c5af423a5bf98634e853e0162;hb=c8a9de5a85fb150d3ceaa5ca1a8b1b2b91d050d5;hp=08bd27286763835b499088896d4884301a35f26f;hpb=5e97de0089e5a91e4dd8bae5aa7e1956597c508b;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ht-cleanup.c b/src/bin/lttng-sessiond/ht-cleanup.c
index 08bd27286..09c13fe00 100644
--- a/src/bin/lttng-sessiond/ht-cleanup.c
+++ b/src/bin/lttng-sessiond/ht-cleanup.c
@@ -27,8 +27,9 @@
 #include "health-sessiond.h"
 #include "testpoint.h"
 #include "utils.h"
+#include "ht-cleanup.h"
 
-int ht_cleanup_quit_pipe[2] = { -1, -1 };
+static int ht_cleanup_quit_pipe[2] = { -1, -1 };
 
 /*
  * Check if the ht_cleanup thread quit pipe was triggered.
@@ -91,6 +92,12 @@ error:
 	return ret;
 }
 
+static void cleanup_ht_cleanup_thread(void *data)
+{
+	utils_close_pipe(ht_cleanup_quit_pipe);
+	utils_close_pipe(ht_cleanup_pipe);
+}
+
 static void *thread_ht_cleanup(void *data)
 {
 	int ret, i, pollfd, err = -1;
@@ -225,54 +232,45 @@ error_testpoint:
 	return NULL;
 }
 
-int init_ht_cleanup_thread(pthread_t *thread)
+static bool shutdown_ht_cleanup_thread(void *data)
 {
 	int ret;
 
-	ret = init_pipe(ht_cleanup_pipe);
-	if (ret) {
-		goto error;
-	}
-
-	init_pipe(ht_cleanup_quit_pipe);
-	if (ret) {
-		goto error_quit_pipe;
-	}
-
-	ret = pthread_create(thread, NULL, thread_ht_cleanup, NULL);
-	if (ret) {
-		errno = ret;
-		PERROR("pthread_create ht_cleanup");
-		goto error_thread;
+	ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
+	if (ret < 0) {
+		ERR("write error on ht_cleanup quit pipe");
+		goto end;
 	}
-
-error:
-	return ret;
-
-error_thread:
-	utils_close_pipe(ht_cleanup_quit_pipe);
-error_quit_pipe:
-	utils_close_pipe(ht_cleanup_pipe);
+end:
 	return ret;
 }
 
-int fini_ht_cleanup_thread(pthread_t *thread)
+struct lttng_thread *launch_ht_cleanup_thread(void)
 {
 	int ret;
+	struct lttng_thread *thread;
 
-	ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
-	if (ret < 0) {
-		ERR("write error on ht_cleanup quit pipe");
-		goto end;
+	ret = init_pipe(ht_cleanup_pipe);
+	if (ret) {
+		goto error;
 	}
 
-	ret = pthread_join(*thread, NULL);
+	ret = init_pipe(ht_cleanup_quit_pipe);
 	if (ret) {
-		errno = ret;
-		PERROR("pthread_join ht cleanup thread");
+		goto error;
 	}
-	utils_close_pipe(ht_cleanup_pipe);
-	utils_close_pipe(ht_cleanup_quit_pipe);
-end:
-	return ret;
+
+	thread = lttng_thread_create("HT cleanup",
+			thread_ht_cleanup,
+			shutdown_ht_cleanup_thread,
+			cleanup_ht_cleanup_thread,
+			NULL);
+	if (!thread) {
+		ret = -1;
+		goto error;
+	}
+	return thread;
+error:
+	cleanup_ht_cleanup_thread(NULL);
+	return NULL;
 }