From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 28 Jun 2018 02:38:52 +0000 (-0400)
Subject: Backport: relayd: track the live viewer worker thread's epoll fd
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flttng-tools.git;a=commitdiff_plain;h=a85f1bc150831f2c5e56bceddce947f809cf8302

Backport: relayd: track the live viewer worker thread's epoll fd

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 72fae0b60..4f14459d4 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -418,15 +418,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.
  *
@@ -1956,7 +1947,8 @@ void *thread_worker(void *data)
 		goto viewer_connections_ht_error;
 	}
 
-	ret = create_thread_poll_set(&events, 2);
+	ret = create_named_thread_poll_set(&events, 2,
+			"Live viewer worker thread epoll");
 	if (ret < 0) {
 		goto error_poll_create;
 	}
@@ -2079,7 +2071,7 @@ restart:
 
 exit:
 error:
-	lttng_poll_clean(&events);
+	(void) fd_tracker_util_poll_clean(the_fd_tracker, &events);
 
 	/* Cleanup reamaining connection object. */
 	rcu_read_lock();