projects
/
deliverable
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport: relayd: track worker thread's epoll fd using the fd-tracker
[deliverable/lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 39bb32f1b0e198325c8213e04f782b1f6de118ad..e1b75192caadce765ed5d108660fde62e97182c3 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-59,6
+59,7
@@
#include <common/config/session-config.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/config/session-config.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
+#include <common/fd-tracker/utils.h>
#include <urcu/rculist.h>
#include "version.h"
#include <urcu/rculist.h>
#include "version.h"
@@
-787,10
+788,22
@@
static int init_thread_quit_pipe(void)
"Quit pipe", thread_quit_pipe);
}
"Quit pipe", thread_quit_pipe);
}
+/*
+ * Init health quit pipe.
+ *
+ * Return -1 on error or 0 if all pipes are created.
+ */
+static int init_health_quit_pipe(void)
+{
+ return fd_tracker_util_pipe_open_cloexec(the_fd_tracker,
+ "Health quit pipe", health_quit_pipe);
+}
+
/*
* Create a poll set with O_CLOEXEC and add the thread quit pipe to the set.
*/
/*
* 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)
+static int create_named_thread_poll_set(struct lttng_poll_event *events,
+ int size, const char *name)
{
int ret;
{
int ret;
@@
-799,10
+812,8
@@
static 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);
@@
-816,6
+827,14
@@
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.
*
@@
-2933,7
+2952,7
@@
static void *relay_thread_worker(void *data)
goto relay_connections_ht_error;
}
goto relay_connections_ht_error;
}
- ret = create_
thread_poll_set(&events, 2
);
+ ret = create_
named_thread_poll_set(&events, 2, "Worker thread epoll"
);
if (ret < 0) {
goto error_poll_create;
}
if (ret < 0) {
goto error_poll_create;
}
@@
-3205,12
+3224,13
@@
error:
}
rcu_read_unlock();
}
rcu_read_unlock();
-
lttng_poll_clean(
&events);
+
(void) fd_tracker_util_poll_clean(the_fd_tracker,
&events);
error_poll_create:
lttng_ht_destroy(relay_connections_ht);
relay_connections_ht_error:
/* Close relay conn pipes */
error_poll_create:
lttng_ht_destroy(relay_connections_ht);
relay_connections_ht_error:
/* Close relay conn pipes */
- utils_close_pipe(relay_conn_pipe);
+ (void) fd_tracker_util_pipe_close(the_fd_tracker,
+ relay_conn_pipe);
if (err) {
DBG("Thread exited with error");
}
if (err) {
DBG("Thread exited with error");
}
@@
-3232,11
+3252,8
@@
error_testpoint:
*/
static int create_relay_conn_pipe(void)
{
*/
static int create_relay_conn_pipe(void)
{
- int ret;
-
- ret = utils_create_pipe_cloexec(relay_conn_pipe);
-
- return ret;
+ return fd_tracker_util_pipe_open_cloexec(the_fd_tracker,
+ "Relayd connection pipe", relay_conn_pipe);
}
/*
}
/*
@@
-3374,7
+3391,7
@@
int main(int argc, char **argv)
goto exit_init_data;
}
goto exit_init_data;
}
- ret =
utils_create_pipe(health_quit_pipe
);
+ ret =
init_health_quit_pipe(
);
if (ret) {
retval = -1;
goto exit_health_quit_pipe;
if (ret) {
retval = -1;
goto exit_health_quit_pipe;
@@
-3470,7
+3487,7
@@
exit_dispatcher_thread:
}
exit_health_thread:
}
exit_health_thread:
-
utils_close_pipe(
health_quit_pipe);
+
(void) fd_tracker_util_pipe_close(the_fd_tracker,
health_quit_pipe);
exit_health_quit_pipe:
exit_init_data:
exit_health_quit_pipe:
exit_init_data:
This page took
0.02784 seconds
and
5
git commands to generate.