From 75898b87d1603db0f20ed852e9704290c8f06715 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 27 Jun 2018 14:58:48 -0400 Subject: [PATCH] Backport: relayd: track the health thread's poll fd with fd-tracker MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/bin/lttng-relayd/health-relayd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c index 13c48a67c..d6e5dc4bd 100644 --- a/src/bin/lttng-relayd/health-relayd.c +++ b/src/bin/lttng-relayd/health-relayd.c @@ -331,8 +331,10 @@ void *thread_manage_health(void *data) goto error; } - /* Size is set to 1 for the consumer_channel pipe */ - ret = lttng_poll_create(&events, 2, LTTNG_CLOEXEC); + /* Size is set to 2 for the unix socket and quit pipe. */ + ret = fd_tracker_util_poll_create(the_fd_tracker, + "Health management thread epoll", &events, 2, + LTTNG_CLOEXEC); if (ret < 0) { ERR("Poll set creation failed"); goto error; @@ -490,7 +492,7 @@ exit: * other processes using them. */ - lttng_poll_clean(&events); + (void) fd_tracker_util_poll_clean(the_fd_tracker, &events); rcu_unregister_thread(); return NULL; -- 2.34.1