projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relayd: track the live viewer worker thread's epoll fd
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
live.c
diff --git
a/src/bin/lttng-relayd/live.c
b/src/bin/lttng-relayd/live.c
index 2a73556dffa0c22c33df136ee53eb39bcc5af362..d318159ca4dc528825d95b1ec7171241cf44d5c0 100644
(file)
--- a/
src/bin/lttng-relayd/live.c
+++ b/
src/bin/lttng-relayd/live.c
@@
-53,6
+53,7
@@
#include <common/sessiond-comm/relayd.h>
#include <common/uri.h>
#include <common/utils.h>
#include <common/sessiond-comm/relayd.h>
#include <common/uri.h>
#include <common/utils.h>
+#include <common/fd-tracker/utils.h>
#include "cmd.h"
#include "live.h"
#include "cmd.h"
#include "live.h"
@@
-435,7
+436,8
@@
int relayd_live_stop(void)
* 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)
{
int ret;
{
int ret;
@@
-444,10
+446,8
@@
int create_thread_poll_set(struct lttng_poll_event *events, int size)
goto error;
}
goto error;
}
- 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);
@@
-541,7
+541,8
@@
void *thread_listener(void *data)
}
/* 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;
}
@@
-650,7
+651,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 (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);
@@
-2177,7
+2178,8
@@
void *thread_worker(void *data)
goto viewer_connections_ht_error;
}
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;
}
if (ret < 0) {
goto error_poll_create;
}
@@
-2300,7
+2302,7
@@
restart:
exit:
error:
exit:
error:
-
lttng_poll_clean(
&events);
+
(void) fd_tracker_util_poll_clean(the_fd_tracker,
&events);
/* Cleanup remaining connection object. */
rcu_read_lock();
/* Cleanup remaining connection object. */
rcu_read_lock();
@@
-2315,7
+2317,7
@@
error_poll_create:
lttng_ht_destroy(viewer_connections_ht);
viewer_connections_ht_error:
/* Close relay conn pipes */
lttng_ht_destroy(viewer_connections_ht);
viewer_connections_ht_error:
/* Close relay conn pipes */
-
utils_close_pipe(
live_conn_pipe);
+
(void) fd_tracker_util_pipe_close(the_fd_tracker,
live_conn_pipe);
if (err) {
DBG("Viewer worker thread exited with error");
}
if (err) {
DBG("Viewer worker thread exited with error");
}
@@
-2339,7
+2341,8
@@
error_testpoint:
*/
static int create_conn_pipe(void)
{
*/
static int create_conn_pipe(void)
{
- return utils_create_pipe_cloexec(live_conn_pipe);
+ return fd_tracker_util_pipe_open_cloexec(the_fd_tracker,
+ "Live connection pipe", live_conn_pipe);
}
int relayd_live_join(void)
}
int relayd_live_join(void)
This page took
0.023961 seconds
and
4
git commands to generate.