summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
87bcbe9)
Create the live listener threads' epoll fd through the
fd_tracker_util_poll_create() util. This causes the resulting fd
(in epoll mode) to be tracked by the fd tracker.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: If93fe5b1cc85d5d3950941edd47910697727ced9
* Create a poll set with O_CLOEXEC and add the thread quit pipe to the set.
*/
static
* 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)
+int create_named_thread_poll_set(struct lttng_poll_event *events,
+ int size, const char *name)
- ret = lttng_poll_create(events, size, LTTNG_CLOEXEC);
- if (ret < 0) {
- goto error;
- }
+ ret = fd_tracker_util_poll_create(the_fd_tracker,
+ name, events, 1, LTTNG_CLOEXEC);
/* Add quit pipe */
ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR);
/* Add quit pipe */
ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR);
+/*
+ * 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.
*
}
/* Pass 2 as size here for the thread quit pipe and control sockets. */
}
/* Pass 2 as size here for the thread quit pipe and control sockets. */
- ret = create_thread_poll_set(&events, 2);
+ ret = create_named_thread_poll_set(&events, 2,
+ "Live listener thread epoll");
if (ret < 0) {
goto error_create_poll;
}
if (ret < 0) {
goto error_create_poll;
}
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 (live_control_sock->fd >= 0) {
ret = live_control_sock->ops->close(live_control_sock);
error_create_poll:
if (live_control_sock->fd >= 0) {
ret = live_control_sock->ops->close(live_control_sock);