relayd: share the same output directory handle accross sessions

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

diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c
index bf3bb8d82cd48bc3fb4ff02a7b56b198aa7ba881..e9c30229a048964de0b3563e96c5f3296f3c619c 100644 (file)
--- a/src/bin/lttng-relayd/health-relayd.c
+++ b/src/bin/lttng-relayd/health-relayd.c
@@ -250,6 +250,23 @@ end:
        return ret;
 }
 
+static
+int open_unix_socket(void *data, int *out_fd)
+{
+       int ret;
+       const char *path = data;
+
+       ret = lttcomm_create_unix_sock(path);
+       if (ret < 0) {
+               goto end;
+       }
+
+       *out_fd = ret;
+       ret = 0;
+end:
+       return ret;
+}
+
 /*
  * Thread managing health check socket.
  */
@@ -261,6 +278,7 @@ void *thread_manage_health(void *data)
        struct health_comm_msg msg;
        struct health_comm_reply reply;
        int is_root;
+       char *sock_name;
 
        DBG("[thread] Manage health check started");
 
@@ -272,8 +290,17 @@ void *thread_manage_health(void *data)
        lttng_poll_init(&events);
 
        /* Create unix socket */
-       sock = lttcomm_create_unix_sock(health_unix_sock_path);
-       if (sock < 0) {
+       ret = asprintf(&sock_name, "Unix socket @ %s", health_unix_sock_path);
+       if (ret == -1) {
+               PERROR("Failed to allocate unix socket name");
+               err = -1;
+               goto error;
+       }
+       ret = fd_tracker_open_unsuspendable_fd(the_fd_tracker, &sock,
+                       (const char **) &sock_name, 1, open_unix_socket,
+                       health_unix_sock_path);
+       free(sock_name);
+       if (ret < 0) {
                ERR("Unable to create health check Unix socket");
                err = -1;
                goto error;
@@ -319,8 +346,10 @@ void *thread_manage_health(void *data)
                goto error;
        }
 
-       /* Size is set to 1 for the consumer_channel pipe */
-       ret = lttng_poll_create(&events, 2, LTTNG_CLOEXEC);
+       /* Size is set to 2 for the unix socket and quit pipe. */
+       ret = fd_tracker_util_poll_create(the_fd_tracker,
+                       "Health management thread epoll", &events, 2,
+                       LTTNG_CLOEXEC);
        if (ret < 0) {
                ERR("Poll set creation failed");
                goto error;
@@ -461,7 +490,8 @@ exit:
        DBG("Health check thread dying");
        unlink(health_unix_sock_path);
        if (sock >= 0) {
-               ret = close(sock);
+               ret = fd_tracker_close_unsuspendable_fd(the_fd_tracker, &sock,
+                               1, fd_tracker_util_close_fd, NULL);
                if (ret) {
                        PERROR("close");
                }
@@ -472,7 +502,7 @@ exit:
         * other processes using them.
         */
 
-       lttng_poll_clean(&events);
+       (void) fd_tracker_util_poll_clean(the_fd_tracker, &events);
 
        rcu_unregister_thread();
        return NULL;