From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 26 Jun 2018 19:17:16 +0000 (-0400)
Subject: Backport: relayd: track the health quit pipe with the fd-tracker
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=98398092f91f58941a8cc7abd7778027e9b2d427

Backport: relayd: track the health quit pipe with the fd-tracker

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index a7a546131..3111c4e00 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -787,6 +787,17 @@ static int init_thread_quit_pipe(void)
 			"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.
  */
@@ -3372,7 +3383,7 @@ int main(int argc, char **argv)
 		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;
@@ -3468,7 +3479,7 @@ exit_dispatcher_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: