Backport: relayd: track the relay_conn_pipe with the fd-tracker
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Tue, 26 Jun 2018 19:07:08 +0000 (15:07 -0400)
committerJonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Fri, 21 Sep 2018 04:00:52 +0000 (00:00 -0400)
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/bin/lttng-relayd/main.c

index 39bb32f1b0e198325c8213e04f782b1f6de118ad..a7a546131df5ff65c21cf28a5bef8852b10efa3a 100644 (file)
@@ -3210,7 +3210,8 @@ 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");
        }
@@ -3232,11 +3233,8 @@ error_testpoint:
  */
 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);
 }
 
 /*
This page took 0.02751 seconds and 5 git commands to generate.