relayd: track the quit pipe with the fd-tracker

[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 07e7a012245d5fa0d36fd919f40d00c380070be1..6234e3e170d92515d1255a15087906531369083a 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -63,6 +63,8 @@
 #include <common/dynamic-buffer.h>
 #include <common/buffer-view.h>
 #include <common/string-utils/format.h>
+#include <common/fd-tracker/fd-tracker.h>
+#include <common/fd-tracker/utils.h>
 
 #include "backward-compatibility-group-by.h"
 #include "cmd.h"
@@ -179,6 +181,9 @@ struct health_app *health_relayd;
 
 struct sessiond_trace_chunk_registry *sessiond_trace_chunk_registry;
 
+/* Global fd tracker. */
+struct fd_tracker *the_fd_tracker;
+
 static struct option long_options[] = {
        { "control-port", 1, 0, 'C', },
        { "data-port", 1, 0, 'D', },
@@ -631,13 +636,9 @@ exit:
 
 static void print_global_objects(void)
 {
-       rcu_register_thread();
-
        print_viewer_streams();
        print_relay_streams();
        print_sessions();
-
-       rcu_unregister_thread();
 }
 
 /*
@@ -664,12 +665,17 @@ static void relayd_cleanup(void)
        }
        /* Close thread quit pipes */
        utils_close_pipe(health_quit_pipe);
-       utils_close_pipe(thread_quit_pipe);
-
+       if (thread_quit_pipe[0] != -1) {
+               (void) fd_tracker_util_pipe_close(
+                               the_fd_tracker, thread_quit_pipe);
+       }
        if (sessiond_trace_chunk_registry) {
                sessiond_trace_chunk_registry_destroy(
                                sessiond_trace_chunk_registry);
        }
+       if (the_fd_tracker) {
+               fd_tracker_destroy(the_fd_tracker);
+       }
 
        uri_free(control_uri);
        uri_free(data_uri);
@@ -678,6 +684,7 @@ static void relayd_cleanup(void)
        if (tracing_group_name_override) {
                free((void *) tracing_group_name);
        }
+       fd_tracker_log(the_fd_tracker);
 }
 
 /*
@@ -831,11 +838,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);
 }
 
 /*
@@ -3977,6 +3981,7 @@ static int create_relay_conn_pipe(void)
  */
 int main(int argc, char **argv)
 {
+       bool thread_is_rcu_registered = false;
        int ret = 0, retval = 0;
        void *status;
 
@@ -4037,23 +4042,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) {
@@ -4071,6 +4065,21 @@ 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();
+       thread_is_rcu_registered = true;
+
+       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);
        if (!health_relayd) {
@@ -4225,6 +4234,10 @@ exit_options:
        /* Ensure all prior call_rcu are done. */
        rcu_barrier();
 
+       if (thread_is_rcu_registered) {
+               rcu_unregister_thread();
+       }
+
        if (!retval) {
                exit(EXIT_SUCCESS);
        } else {