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 listener's epoll fd using the fd-tracker
[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 f1f03d1bd36c90c7feefb9f417d5748f8cd10c4f..6318f8308f10ba059af1a3f886bff46a274ad93c 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-64,6
+64,7
@@
#include <common/buffer-view.h>
#include <common/string-utils/format.h>
#include <common/fd-tracker/fd-tracker.h>
#include <common/buffer-view.h>
#include <common/string-utils/format.h>
#include <common/fd-tracker/fd-tracker.h>
+#include <common/fd-tracker/utils.h>
#include "backward-compatibility-group-by.h"
#include "cmd.h"
#include "backward-compatibility-group-by.h"
#include "cmd.h"
@@
-663,9
+664,14
@@
static void relayd_cleanup(void)
health_app_destroy(health_relayd);
}
/* Close thread quit pipes */
health_app_destroy(health_relayd);
}
/* Close thread quit pipes */
- utils_close_pipe(health_quit_pipe);
- utils_close_pipe(thread_quit_pipe);
-
+ if (health_quit_pipe[0] != -1) {
+ (void) fd_tracker_util_pipe_close(
+ the_fd_tracker, health_quit_pipe);
+ }
+ if (thread_quit_pipe[0] != -1) {
+ (void) fd_tracker_util_pipe_close(
+ the_fd_tracker, thread_quit_pipe);
+ }
if (sessiond_trace_chunk_registry) {
sessiond_trace_chunk_registry_destroy(
sessiond_trace_chunk_registry);
if (sessiond_trace_chunk_registry) {
sessiond_trace_chunk_registry_destroy(
sessiond_trace_chunk_registry);
@@
-835,17
+841,26
@@
void lttng_relay_notify_ready(void)
*/
static int init_thread_quit_pipe(void)
{
*/
static int init_thread_quit_pipe(void)
{
- int ret;
-
- ret = utils_create_pipe_cloexec(thread_quit_pipe);
+ return fd_tracker_util_pipe_open_cloexec(
+ the_fd_tracker, "Quit pipe", thread_quit_pipe);
+}
- return ret;
+/*
+ * 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;
@@
-854,10
+869,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);
@@
-956,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;
}
@@
-1090,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);
@@
-3673,7
+3686,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;
}
@@
-3942,12
+3955,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");
}
@@
-3969,11
+3983,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);
}
/*
}
/*
@@
-4042,23
+4053,12
@@
int main(int argc, char **argv)
/* Daemonize */
if (opt_daemon || opt_background) {
/* Daemonize */
if (opt_daemon || opt_background) {
- int i;
-
ret = lttng_daemonize(&child_ppid, &recv_child_signal,
!opt_background);
if (ret < 0) {
retval = -1;
goto exit_options;
}
ret = lttng_daemonize(&child_ppid, &recv_child_signal,
!opt_background);
if (ret < 0) {
retval = -1;
goto exit_options;
}
-
- /*
- * We are in the child. Make sure all other file
- * descriptors are closed, in case we are called with
- * more opened file descriptors than the standard ones.
- */
- for (i = 3; i < sysconf(_SC_OPEN_MAX); i++) {
- (void) close(i);
- }
}
if (opt_working_directory) {
}
if (opt_working_directory) {
@@
-4139,7
+4139,7
@@
int main(int argc, char **argv)
goto exit_options;
}
goto exit_options;
}
- ret =
utils_create_pipe(health_quit_pipe
);
+ ret =
init_health_quit_pipe(
);
if (ret) {
retval = -1;
goto exit_options;
if (ret) {
retval = -1;
goto exit_options;
This page took
0.02668 seconds
and
4
git commands to generate.