Port: Remove _GNU_SOURCE, defined in config.h

[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 2ce1c1fdafa763a180e15d894de041fb55369664..10a0e5fdffe1b88ab4ae144dcfff87f381b38b1a 100644 (file)
--- a/src/bin/lttng-relayd/health-relayd.c
+++ b/src/bin/lttng-relayd/health-relayd.c
@@ -15,7 +15,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
@@ -36,7 +36,6 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <assert.h>
-#include <config.h>
 #include <urcu/compiler.h>
 #include <ulimit.h>
 #include <inttypes.h>
@@ -48,14 +47,14 @@
 #include <common/compat/poll.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/utils.h>
+#include <common/compat/getenv.h>
 
 #include "lttng-relayd.h"
 #include "health-relayd.h"
 
 /* Global health check unix path */
-static char health_unix_sock_path[PATH_MAX];
-static char *relayd_path;
-static char *lttng_rundir;
+static
+char health_unix_sock_path[PATH_MAX];
 
 int health_quit_pipe[2];
 
@@ -131,16 +130,40 @@ error:
        return ret;
 }
 
+static
+int parse_health_env(void)
+{
+       const char *health_path;
+
+       health_path = lttng_secure_getenv(LTTNG_RELAYD_HEALTH_ENV);
+       if (health_path) {
+               strncpy(health_unix_sock_path, health_path,
+                       PATH_MAX);
+               health_unix_sock_path[PATH_MAX - 1] = '\0';
+       }
+
+       return 0;
+}
+
 static
 int setup_health_path(void)
 {
        int is_root, ret = 0;
-       char *home_path = NULL;
+       char *home_path = NULL, *rundir = NULL, *relayd_path = NULL;
+
+       ret = parse_health_env();
+       if (ret) {
+               return ret;
+       }
 
        is_root = !getuid();
 
        if (is_root) {
-               lttng_rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+               rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+               if (!rundir) {
+                       ret = -ENOMEM;
+                       goto end;
+               }
        } else {
                /*
                 * Create rundir from home path. This will create something like
@@ -155,20 +178,20 @@ int setup_health_path(void)
                        goto end;
                }
 
-               ret = asprintf(&lttng_rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
+               ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
                if (ret < 0) {
                        ret = -ENOMEM;
                        goto end;
                }
        }
 
-       ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH, lttng_rundir);
+       ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH, rundir);
        if (ret < 0) {
                ret = -ENOMEM;
                goto end;
        }
 
-       ret = create_lttng_rundir_with_perm(lttng_rundir);
+       ret = create_lttng_rundir_with_perm(rundir);
        if (ret < 0) {
                goto end;
        }
@@ -197,6 +220,8 @@ int setup_health_path(void)
        }
 
 end:
+       free(rundir);
+       free(relayd_path);
        return ret;
 }
 
@@ -280,6 +305,8 @@ void *thread_manage_health(void *data)
                goto error;
        }
 
+       lttng_relay_notify_ready();
+
        while (1) {
                DBG("Health check ready");
 
@@ -303,6 +330,11 @@ restart:
                        revents = LTTNG_POLL_GETEV(&events, i);
                        pollfd = LTTNG_POLL_GETFD(&events, i);
 
+                       if (!revents) {
+                               /* No activity for this FD (poll implementation). */
+                               continue;
+                       }
+
                        /* Thread quit pipe has been closed. Killing thread. */
                        ret = check_health_quit_pipe(pollfd, revents);
                        if (ret) {
@@ -312,9 +344,14 @@ restart:
 
                        /* Event on the registration socket */
                        if (pollfd == sock) {
-                               if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+                               if (revents & LPOLLIN) {
+                                       continue;
+                               } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
                                        ERR("Health socket poll error");
                                        goto error;
+                               } else {
+                                       ERR("Unexpected poll events %u for sock %d", revents, pollfd);
+                                       goto error;
                                }
                        }
                }
@@ -346,7 +383,7 @@ restart:
 
                assert(msg.cmd == HEALTH_CMD_CHECK);
 
-               reply.ret_code = 0;
+               memset(&reply, 0, sizeof(reply));
                for (i = 0; i < NR_HEALTH_RELAYD_TYPES; i++) {
                        /*
                         * health_check_state return 0 if thread is in
@@ -379,11 +416,6 @@ error:
        }
        DBG("Health check thread dying");
        unlink(health_unix_sock_path);
-       (void) rmdir(relayd_path);
-       free(relayd_path);
-       (void) rmdir(lttng_rundir);
-       free(lttng_rundir);
-
        if (sock >= 0) {
                ret = close(sock);
                if (ret) {
@@ -391,6 +423,11 @@ error:
                }
        }
 
+       /*
+        * We do NOT rmdir rundir nor the relayd path because there are
+        * other processes using them.
+        */
+
        lttng_poll_clean(&events);
 
        rcu_unregister_thread();