From e5e4e2742b1dbc9c55c2fe6cbffe2aaa8cdc6bdc Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 26 Jun 2018 14:51:22 -0400 Subject: [PATCH] Backport: relayd: track the quit pipe with the fd-tracker MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/bin/lttng-relayd/main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index 0d270d1ca..39bb32f1b 100644 --- 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 */ - 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); @@ -783,11 +783,8 @@ void lttng_relay_notify_ready(void) */ static int init_thread_quit_pipe(void) { - int ret; - - ret = utils_create_pipe_cloexec(thread_quit_pipe); - - return ret; + return fd_tracker_util_pipe_open_cloexec(the_fd_tracker, + "Quit pipe", thread_quit_pipe); } /* -- 2.34.1