X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fht-cleanup.c;h=57d6aec118bc6f5ac1df1df3057d63077b82b315;hb=3628d5bd420ccb6e7937506a2dbadb95bd3d2d0b;hp=890c9a8215e26967c5ff6b42b5cf171295cdc306;hpb=6c71277b0dc97ce8a4ac6b8d359b4b349c04b658;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ht-cleanup.c b/src/bin/lttng-sessiond/ht-cleanup.c
index 890c9a821..57d6aec11 100644
--- a/src/bin/lttng-sessiond/ht-cleanup.c
+++ b/src/bin/lttng-sessiond/ht-cleanup.c
@@ -24,10 +24,12 @@
 
 #include "lttng-sessiond.h"
 #include "health-sessiond.h"
+#include "testpoint.h"
 
 void *thread_ht_cleanup(void *data)
 {
 	int ret, i, pollfd, err = -1;
+	ssize_t size_ret;
 	uint32_t revents, nb_fd;
 	struct lttng_poll_event events;
 
@@ -38,6 +40,10 @@ void *thread_ht_cleanup(void *data)
 
 	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);
 
+	if (testpoint(sessiond_thread_ht_cleanup)) {
+		goto error_testpoint;
+	}
+
 	health_code_update();
 
 	ret = sessiond_set_thread_pollset(&events, 2);
@@ -54,13 +60,14 @@ void *thread_ht_cleanup(void *data)
 	health_code_update();
 
 	while (1) {
-		DBG3("[ht-thread] Polling on %d fds.",
-			LTTNG_POLL_GETNB(&events));
+		DBG3("[ht-thread] Polling.");
 
 		/* Inifinite blocking call, waiting for transmission */
 restart:
 		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) {
 			/*
@@ -83,6 +90,14 @@ restart:
 			revents = LTTNG_POLL_GETEV(&events, i);
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
+			if (!revents) {
+				/*
+				 * No activity for this FD
+				 * (poll implementation).
+				 */
+				continue;
+			}
+
 			/* Thread quit pipe has been closed. Killing thread. */
 			ret = sessiond_check_thread_quit_pipe(pollfd, revents);
 			if (ret) {
@@ -100,11 +115,10 @@ restart:
 				goto error;
 			}
 
-			do {
-				/* Get socket from dispatch thread. */
-				ret = read(ht_cleanup_pipe[0], &ht, sizeof(ht));
-			} while (ret < 0 && errno == EINTR);
-			if (ret < 0 || ret < sizeof(ht)) {
+			/* Get socket from dispatch thread. */
+			size_ret = lttng_read(ht_cleanup_pipe[0], &ht,
+					sizeof(ht));
+			if (size_ret < sizeof(ht)) {
 				PERROR("ht cleanup notify pipe");
 				goto error;
 			}
@@ -125,6 +139,7 @@ exit:
 error:
 	lttng_poll_clean(&events);
 error_poll_create:
+error_testpoint:
 	utils_close_pipe(ht_cleanup_pipe);
 	ht_cleanup_pipe[0] = ht_cleanup_pipe[1] = -1;
 	DBG("[ust-thread] cleanup complete.");