X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=16bfccbfa0c982cd3c7fcd33c0ed1ea0999369cf;hp=80d2fb1892658d9e4c46c1bce9631aa357dedbc3;hb=9c256b0146b021962e93fda7400c61ceb2b0d45f;hpb=bcee2b96c2ddf927ddcbbc6584cda7d3c17bbb95

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 80d2fb189..16bfccbfa 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -677,6 +677,11 @@ static void relayd_cleanup(void)
 				sessiond_trace_chunk_registry);
 	}
 	if (the_fd_tracker) {
+		untrack_stdio();
+		/*
+		 * fd_tracker_destroy() will log the contents of the fd-tracker
+		 * if a leak is detected.
+		 */
 		fd_tracker_destroy(the_fd_tracker);
 	}
 
@@ -687,7 +692,6 @@ static void relayd_cleanup(void)
 	if (tracing_group_name_override) {
 		free((void *) tracing_group_name);
 	}
-	fd_tracker_log(the_fd_tracker);
 }
 
 /*
@@ -859,7 +863,8 @@ static int init_health_quit_pipe(void)
 /*
  * Create a poll set with O_CLOEXEC and add the thread quit pipe to the set.
  */
-static int create_thread_poll_set(struct lttng_poll_event *events, int size)
+static int create_named_thread_poll_set(struct lttng_poll_event *events,
+		int size, const char *name)
 {
 	int ret;
 
@@ -868,10 +873,8 @@ static int create_thread_poll_set(struct lttng_poll_event *events, int size)
 		goto error;
 	}
 
-	ret = lttng_poll_create(events, size, LTTNG_CLOEXEC);
-	if (ret < 0) {
-		goto error;
-	}
+	ret = fd_tracker_util_poll_create(the_fd_tracker,
+		        name, events, 1, LTTNG_CLOEXEC);
 
 	/* Add quit pipe */
 	ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR);
@@ -970,7 +973,7 @@ static void *relay_thread_listener(void *data)
 	 * Pass 3 as size here for the thread quit pipe, control and
 	 * data socket.
 	 */
-	ret = create_thread_poll_set(&events, 3);
+	ret = create_named_thread_poll_set(&events, 3, "Listener thread epoll");
 	if (ret < 0) {
 		goto error_create_poll;
 	}
@@ -1104,7 +1107,7 @@ exit:
 error:
 error_poll_add:
 error_testpoint:
-	lttng_poll_clean(&events);
+	(void) fd_tracker_util_poll_clean(the_fd_tracker, &events);
 error_create_poll:
 	if (data_sock->fd >= 0) {
 		ret = data_sock->ops->close(data_sock);
@@ -3687,7 +3690,7 @@ static void *relay_thread_worker(void *data)
 		goto relay_connections_ht_error;
 	}
 
-	ret = create_thread_poll_set(&events, 2);
+	ret = create_named_thread_poll_set(&events, 2, "Worker thread epoll");
 	if (ret < 0) {
 		goto error_poll_create;
 	}
@@ -3956,7 +3959,7 @@ error:
 	}
 	rcu_read_unlock();
 
-	lttng_poll_clean(&events);
+	(void) fd_tracker_util_poll_clean(the_fd_tracker, &events);
 error_poll_create:
 	lttng_ht_destroy(relay_connections_ht);
 relay_connections_ht_error:
@@ -3988,6 +3991,39 @@ static int create_relay_conn_pipe(void)
 			"Relayd connection pipe", relay_conn_pipe);
 }
 
+static int stdio_open(void *data, int *fds)
+{
+	fds[0] = fileno(stdout);
+	fds[1] = fileno(stderr);
+	return 0;
+}
+
+static int noop_close(void *data, int *fds)
+{
+	return 0;
+}
+
+static int track_stdio(void)
+{
+	int fds[2];
+	const char *names[] = { "stdout", "stderr" };
+
+	return fd_tracker_open_unsuspendable_fd(the_fd_tracker, fds,
+			names, 2, stdio_open, NULL);
+}
+
+static void untrack_stdio(void)
+{
+	int fds[] = { fileno(stdout), fileno(stderr) };
+
+	/*
+	 * noop_close is used since we don't really want to close
+	 * the stdio output fds; we merely want to stop tracking them.
+	 */
+	(void) fd_tracker_close_unsuspendable_fd(the_fd_tracker,
+			fds, 2, noop_close, NULL);
+}
+
 /*
  * main
  */
@@ -4092,6 +4128,12 @@ int main(int argc, char **argv)
 		goto exit_options;
 	}
 
+	ret = track_stdio();
+	if (ret) {
+		retval = -1;
+		goto exit_options;
+	}
+
 	/* Initialize thread health monitoring */
 	health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES);
 	if (!health_relayd) {