X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fht-cleanup.c;h=c5f64dae543eac94f90af66ff6d451c083d3551e;hb=e8fcabef14e1e2ce8d159c68c5585931df1216b4;hp=ace41e5cd5654f6a791e50c82fe90bcc8c406722;hpb=74588b4dd1cb7a84b4f64f7bf48eb71b049d1293;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ht-cleanup.c b/src/bin/lttng-sessiond/ht-cleanup.c
index ace41e5cd..c5f64dae5 100644
--- a/src/bin/lttng-sessiond/ht-cleanup.c
+++ b/src/bin/lttng-sessiond/ht-cleanup.c
@@ -64,16 +64,14 @@ void *thread_ht_cleanup(void *data)
 	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) {
 			/*
@@ -96,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;
 			}
@@ -128,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();
 
@@ -140,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;
 			}