#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;
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();
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;
}
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.");