projects
/
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 the health quit pipe with 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 0d270d1ca29e5c0e0c5e0d642011d583198ca5bd..3111c4e005a049d46fdc8466e0e09c1fc60bfdf4 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-620,7
+620,7
@@
static void relayd_cleanup(void)
free(opt_output_path);
/* Close thread quit pipes */
free(opt_output_path);
/* Close thread quit pipes */
-
utils_close_pipe(
thread_quit_pipe);
+
(void) fd_tracker_util_pipe_close(the_fd_tracker,
thread_quit_pipe);
uri_free(control_uri);
uri_free(data_uri);
uri_free(control_uri);
uri_free(data_uri);
@@
-783,11
+783,19
@@
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);
}
/*
}
/*
@@
-3213,7
+3221,8
@@
error_poll_create:
lttng_ht_destroy(relay_connections_ht);
relay_connections_ht_error:
/* Close relay conn pipes */
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");
}
@@
-3235,11
+3244,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);
}
/*
}
/*
@@
-3377,7
+3383,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;
@@
-3473,7
+3479,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.03807 seconds
and
5
git commands to generate.