Backport: relayd: Don't bypass the fd tracker when closing file descriptors

[lttng-tools.git] / src / bin / lttng-relayd / main.c

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 7cb0140c6e40205cdb33cda92fc65016ecffc84d..0d270d1ca29e5c0e0c5e0d642011d583198ca5bd 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -165,6 +165,9 @@ struct lttng_ht *sessions_ht;
 /* Relayd health monitoring */
 struct health_app *health_relayd;
 
+/* Global fd tracker. */
+struct fd_tracker *the_fd_tracker;
+
 static struct option long_options[] = {
        { "control-port", 1, 0, 'C', },
        { "data-port", 1, 0, 'D', },
@@ -592,13 +595,9 @@ exit:
 
 static void print_global_objects(void)
 {
-       rcu_register_thread();
-
        print_viewer_streams();
        print_relay_streams();
        print_sessions();
-
-       rcu_unregister_thread();
 }
 
 /*
@@ -630,6 +629,7 @@ static void relayd_cleanup(void)
        if (tracing_group_name_override) {
                free((void *) tracing_group_name);
        }
+       fd_tracker_log(the_fd_tracker);
 }
 
 /*
@@ -3276,6 +3276,11 @@ int main(int argc, char **argv)
                goto exit_options;
        }
 
+       ret = fclose(stdin);
+       if (ret) {
+               PERROR("Failed to close stdin");
+               goto exit_options;
+       }
        /* Try to create directory if -o, --output is specified. */
        if (opt_output_path) {
                if (*opt_output_path != '/') {
@@ -3295,26 +3300,14 @@ 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) {
                ret = utils_change_working_dir(opt_working_directory);
                if (ret) {
@@ -3322,6 +3315,19 @@ int main(int argc, char **argv)
                        goto exit_options;
                }
        }
+       /*
+        * The RCU thread registration (and use, through the fd-tracker's
+        * creation) is done after the daemonization to allow us to not
+        * deal with liburcu's fork() management as the call RCU needs to
+        * be restored.
+        */
+       rcu_register_thread();
+
+       the_fd_tracker = fd_tracker_create(lttng_opt_fd_cap);
+       if (!the_fd_tracker) {
+               retval = -1;
+               goto exit_options;
+       }
 
        /* Initialize thread health monitoring */
        health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES);
@@ -3485,6 +3491,9 @@ exit_options:
        /* Ensure all prior call_rcu are done. */
        rcu_barrier();
 
+       fd_tracker_destroy(the_fd_tracker);
+       rcu_unregister_thread();
+
        if (!retval) {
                exit(EXIT_SUCCESS);
        } else {