Clean-up: remove dead assignment from ht cleanup thread launcher

[lttng-tools.git] / src / bin / lttng-sessiond / ht-cleanup.c

diff --git a/src/bin/lttng-sessiond/ht-cleanup.c b/src/bin/lttng-sessiond/ht-cleanup.c
index a3b046b8834a2eaaa7dd74b9bb0bb0beb6cff806..f5aab3309280daa9c4550b967334ebe8f6449278 100644 (file)
--- 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;
@@ -121,6 +128,7 @@ static void *thread_ht_cleanup(void *data)
        health_code_update();
 
        while (1) {
+       restart:
                DBG3("[ht-thread] Polling.");
                health_poll_entry();
                ret = lttng_poll_wait(&events, -1);
@@ -147,11 +155,6 @@ static void *thread_ht_cleanup(void *data)
                        revents = LTTNG_POLL_GETEV(&events, i);
                        pollfd = LTTNG_POLL_GETFD(&events, i);
 
-                       if (!revents) {
-                               /* No activity for this FD (poll implementation). */
-                               continue;
-                       }
-
                        if (pollfd != ht_cleanup_pipe[0]) {
                                continue;
                        }
@@ -174,6 +177,13 @@ static void *thread_ht_cleanup(void *data)
                                lttng_ht_destroy(ht);
 
                                health_code_update();
+
+                               /*
+                                * Ensure that we never process the quit pipe
+                                * event while there is still data available
+                                * on the ht clean pipe.
+                                */
+                               goto restart;
                        } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
                                ERR("ht cleanup pipe error");
                                goto error;
@@ -225,10 +235,24 @@ error_testpoint:
        return NULL;
 }
 
-int init_ht_cleanup_thread(pthread_t *thread)
+static bool shutdown_ht_cleanup_thread(void *data)
 {
        int ret;
 
+       ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
+       if (ret < 0) {
+               ERR("write error on ht_cleanup quit pipe");
+               goto end;
+       }
+end:
+       return ret;
+}
+
+struct lttng_thread *launch_ht_cleanup_thread(void)
+{
+       int ret;
+       struct lttng_thread *thread;
+
        ret = init_pipe(ht_cleanup_pipe);
        if (ret) {
                goto error;
@@ -236,44 +260,19 @@ int init_ht_cleanup_thread(pthread_t *thread)
 
        ret = init_pipe(ht_cleanup_quit_pipe);
        if (ret) {
-               goto error_quit_pipe;
+               goto error;
        }
 
-       ret = pthread_create(thread, default_pthread_attr(), thread_ht_cleanup,
+       thread = lttng_thread_create("HT cleanup",
+                       thread_ht_cleanup,
+                       shutdown_ht_cleanup_thread,
+                       cleanup_ht_cleanup_thread,
                        NULL);
-       if (ret) {
-               errno = ret;
-               PERROR("pthread_create ht_cleanup");
-               goto error_thread;
+       if (!thread) {
+               goto error;
        }
-
+       return thread;
 error:
-       return ret;
-
-error_thread:
-       utils_close_pipe(ht_cleanup_quit_pipe);
-error_quit_pipe:
-       utils_close_pipe(ht_cleanup_pipe);
-       return ret;
-}
-
-int fini_ht_cleanup_thread(pthread_t *thread)
-{
-       int ret;
-
-       ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
-       if (ret < 0) {
-               ERR("write error on ht_cleanup quit pipe");
-               goto end;
-       }
-
-       ret = pthread_join(*thread, NULL);
-       if (ret) {
-               errno = ret;
-               PERROR("pthread_join ht cleanup thread");
-       }
-       utils_close_pipe(ht_cleanup_pipe);
-       utils_close_pipe(ht_cleanup_quit_pipe);
-end:
-       return ret;
+       cleanup_ht_cleanup_thread(NULL);
+       return NULL;
 }