#include "health-sessiond.h"
#include "testpoint.h"
#include "utils.h"
+#include "ht-cleanup.h"
-int ht_cleanup_quit_pipe[2] = { -1, -1 };
+static int ht_cleanup_quit_pipe[2] = { -1, -1 };
/*
* Check if the ht_cleanup thread quit pipe was triggered.
return ret;
}
+static void cleanup_ht_cleanup_thread(void *data)
+{
+ utils_close_pipe(ht_cleanup_quit_pipe);
+ utils_close_pipe(ht_cleanup_pipe);
+}
+
static void *thread_ht_cleanup(void *data)
{
int ret, i, pollfd, err = -1;
health_code_update();
while (1) {
+ restart:
DBG3("[ht-thread] Polling.");
health_poll_entry();
ret = lttng_poll_wait(&events, -1);
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;
}
lttng_ht_destroy(ht);
health_code_update();
+
+ /*
+ * Ensure that we never process the quit pipe
+ * event while there is still data available
+ * on the ht clean pipe.
+ */
+ goto restart;
} else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
ERR("ht cleanup pipe error");
goto error;
return NULL;
}
-int init_ht_cleanup_thread(pthread_t *thread)
+static bool shutdown_ht_cleanup_thread(void *data)
{
int ret;
- ret = init_pipe(ht_cleanup_pipe);
- if (ret) {
- goto error;
- }
-
- init_pipe(ht_cleanup_quit_pipe);
- if (ret) {
- goto error_quit_pipe;
- }
-
- ret = pthread_create(thread, NULL, thread_ht_cleanup, NULL);
- if (ret) {
- errno = ret;
- PERROR("pthread_create ht_cleanup");
- goto error_thread;
+ ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
+ if (ret < 0) {
+ ERR("write error on ht_cleanup quit pipe");
+ goto end;
}
-
-error:
- return ret;
-
-error_thread:
- utils_close_pipe(ht_cleanup_quit_pipe);
-error_quit_pipe:
- utils_close_pipe(ht_cleanup_pipe);
+end:
return ret;
}
-int fini_ht_cleanup_thread(pthread_t *thread)
+struct lttng_thread *launch_ht_cleanup_thread(void)
{
int ret;
+ struct lttng_thread *thread;
- ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
- if (ret < 0) {
- ERR("write error on ht_cleanup quit pipe");
- goto end;
+ ret = init_pipe(ht_cleanup_pipe);
+ if (ret) {
+ goto error;
}
- ret = pthread_join(*thread, NULL);
+ ret = init_pipe(ht_cleanup_quit_pipe);
if (ret) {
- errno = ret;
- PERROR("pthread_join ht cleanup thread");
+ goto error;
}
- utils_close_pipe(ht_cleanup_pipe);
- utils_close_pipe(ht_cleanup_quit_pipe);
-end:
- return ret;
+
+ thread = lttng_thread_create("HT cleanup",
+ thread_ht_cleanup,
+ shutdown_ht_cleanup_thread,
+ cleanup_ht_cleanup_thread,
+ NULL);
+ if (!thread) {
+ ret = -1;
+ goto error;
+ }
+ return thread;
+error:
+ cleanup_ht_cleanup_thread(NULL);
+ return NULL;
}