relayd: track listener's epoll fd using the fd-tracker

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 <jeremie.galarneau@efficios.com>
Change-Id: I56bdc7f0f7c43993e44bcfc220bc09af561ace56

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index c1681aafc0567ba10a372e496ef242223765eba0..6318f8308f10ba059af1a3f886bff46a274ad93c 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -884,14 +884,6 @@ error:
        return ret;
 }
 
        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.
  *
 /*
  * Check if the thread quit pipe was triggered.
  *


@@ -977,7 +969,7 @@ static void *relay_thread_listener(void *data)
         * Pass 3 as size here for the thread quit pipe, control and
         * data socket.
         */
         * 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;
        }
        if (ret < 0) {
                goto error_create_poll;
        }


@@ -1111,7 +1103,7 @@ exit:
 error:
 error_poll_add:
 error_testpoint:
 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);
 error_create_poll:
        if (data_sock->fd >= 0) {
                ret = data_sock->ops->close(data_sock);