X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fht-cleanup.c;h=a201506c0eb1da3ad94ac110c351ad3fc0d064e7;hb=8c93562f396a3e785c5193ca32b40f1f16599a6a;hp=4eb0c003437574e8790fa95ce02d7cac3ef09ec2;hpb=8782cc7477fae212607b9fd6395a4b2e2d3357ed;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ht-cleanup.c b/src/bin/lttng-sessiond/ht-cleanup.c
index 4eb0c0034..a201506c0 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;
 
@@ -36,7 +38,11 @@ void *thread_ht_cleanup(void *data)
 	rcu_register_thread();
 	rcu_thread_online();
 
-	health_register(health_sessiond, HEALTH_TYPE_HT_CLEANUP);
+	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);
+
+	if (testpoint(sessiond_thread_ht_cleanup)) {
+		goto error_testpoint;
+	}
 
 	health_code_update();
 
@@ -100,11 +106,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 +130,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.");