Cleanup: Remove logically dead code

[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 79fb9cd630831865b08b5e2989b0bf71fe7226f5..c5f64dae543eac94f90af66ff6d451c083d3551e 100644 (file)
--- a/src/bin/lttng-sessiond/ht-cleanup.c
+++ b/src/bin/lttng-sessiond/ht-cleanup.c
@@ -42,6 +42,7 @@ void *thread_ht_cleanup(void *data)
        health_register(health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);
 
        if (testpoint(sessiond_thread_ht_cleanup)) {
+               DBG("[ht-thread] testpoint.");
                goto error_testpoint;
        }
 
@@ -49,28 +50,28 @@ void *thread_ht_cleanup(void *data)
 
        ret = sessiond_set_ht_cleanup_thread_pollset(&events, 2);
        if (ret < 0) {
+               DBG("[ht-thread] sessiond_set_ht_cleanup_thread_pollset error %d.", ret);
                goto error_poll_create;
        }
 
        /* Add pipe to the pollset. */
        ret = lttng_poll_add(&events, ht_cleanup_pipe[0], LPOLLIN | LPOLLERR);
        if (ret < 0) {
+               DBG("[ht-thread] lttng_poll_add error %d.", ret);
                goto error;
        }
 
        health_code_update();
 
        while (1) {
-               int handled_event;
-
-               DBG3("[ht-thread] Polling on %d fds.",
-                       LTTNG_POLL_GETNB(&events));
+               DBG3("[ht-thread] Polling.");
 
                /* Inifinite blocking call, waiting for transmission */
 restart:
-               handled_event = 0;
                health_poll_entry();
                ret = lttng_poll_wait(&events, -1);
+               DBG3("[ht-thread] Returning from poll on %d fds.",
+                       LTTNG_POLL_GETNB(&events));
                health_poll_exit();
                if (ret < 0) {
                        /*
@@ -93,6 +94,11 @@ restart:
                        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;
                        }
@@ -125,11 +131,6 @@ restart:
                        health_code_update();
                }
 
-               /* Only check cleanup quit when no more work to do. */
-               if (handled_event) {
-                       continue;
-               }
-
                for (i = 0; i < nb_fd; i++) {
                        health_code_update();
 
@@ -137,6 +138,11 @@ restart:
                        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;
                        }
@@ -145,6 +151,7 @@ restart:
                        ret = sessiond_check_ht_cleanup_quit(pollfd, revents);
                        if (ret) {
                                err = 0;
+                               DBG("[ht-cleanup] quit.");
                                goto exit;
                        }
                }