X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=39bb32f1b0e198325c8213e04f782b1f6de118ad;hb=e5e4e2742b1dbc9c55c2fe6cbffe2aaa8cdc6bdc;hp=e22d58cf443d344fff314329170f32828ab01f01;hpb=75d29f1323a5ccc6eef3273a58db321d24277f65;p=deliverable%2Flttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index e22d58cf4..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);
 }
 
 /*
@@ -3300,23 +3297,12 @@ int main(int argc, char **argv)
 
 	/* Daemonize */
 	if (opt_daemon || opt_background) {
-		int i;
-
 		ret = lttng_daemonize(&child_ppid, &recv_child_signal,
 			!opt_background);
 		if (ret < 0) {
 			retval = -1;
 			goto exit_options;
 		}
-
-		/*
-		 * We are in the child. Make sure all other file
-		 * descriptors are closed, in case we are called with
-		 * more opened file descriptors than the standard ones.
-		 */
-		for (i = 3; i < sysconf(_SC_OPEN_MAX); i++) {
-			(void) close(i);
-		}
 	}
 
 	if (opt_working_directory) {