projects
/
deliverable
/
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 health quit pipe with 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 6234e3e170d92515d1255a15087906531369083a..80d2fb1892658d9e4c46c1bce9631aa357dedbc3 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-664,7
+664,10
@@
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);
+ 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 (thread_quit_pipe[0] != -1) {
(void) fd_tracker_util_pipe_close(
the_fd_tracker, thread_quit_pipe);
@@
-842,6
+845,17
@@
static int init_thread_quit_pipe(void)
the_fd_tracker, "Quit pipe", thread_quit_pipe);
}
the_fd_tracker, "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.
*/
@@
-3947,7
+3961,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");
}
@@
-3969,11
+3984,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);
}
/*
}
/*
@@
-4128,7
+4140,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.025288 seconds
and
5
git commands to generate.