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 09c13fe003d7d40c5af423a5bf98634e853e0162..f5aab3309280daa9c4550b967334ebe8f6449278 100644 (file)
--- a/src/bin/lttng-sessiond/ht-cleanup.c
+++ b/src/bin/lttng-sessiond/ht-cleanup.c
@@ -128,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);
@@ -154,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;
                        }
@@ -181,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;
@@ -266,7 +269,6 @@ struct lttng_thread *launch_ht_cleanup_thread(void)
                        cleanup_ht_cleanup_thread,
                        NULL);
        if (!thread) {
-               ret = -1;
                goto error;
        }
        return thread;