From 0a9eff096ef480f16445be173badc90f5b6540d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 27 Jun 2018 15:48:53 -0400 Subject: [PATCH] Backport: relayd: track listener's epoll fd using the fd-tracker MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This addresses the bogus fd report mentionned in a previous patch of this series as the clean-up of the listener thread's epoll fd now occurs through the fd-tracker. Signed-off-by: Jérémie Galarneau --- src/bin/lttng-relayd/main.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index e1b75192c..f5bb9409f 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -827,14 +827,6 @@ error: return ret; } -/* - * Create a poll set with O_CLOEXEC and add the thread quit pipe to the set. - */ -static int create_thread_poll_set(struct lttng_poll_event *events, int size) -{ - return create_named_thread_poll_set(events, size, "Unknown epoll"); -} - /* * Check if the thread quit pipe was triggered. * @@ -919,7 +911,7 @@ static void *relay_thread_listener(void *data) * Pass 3 as size here for the thread quit pipe, control and * data socket. */ - ret = create_thread_poll_set(&events, 3); + ret = create_named_thread_poll_set(&events, 3, "Listener thread epoll"); if (ret < 0) { goto error_create_poll; } @@ -1061,7 +1053,7 @@ exit: error: error_poll_add: error_testpoint: - lttng_poll_clean(&events); + (void) fd_tracker_util_poll_clean(the_fd_tracker, &events); error_create_poll: if (data_sock->fd >= 0) { ret = data_sock->ops->close(data_sock); -- 2.34.1