Teardown the notification thread after the sessiond clean-up

[lttng-tools.git] / src / bin / lttng-sessiond / utils.c

diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c
index ce2e97561f0170c3dbdb072370e79b1e5ec502ae..99ec7772bfcf849da5730c5aeca3e7924e870261 100644 (file)
--- a/src/bin/lttng-sessiond/utils.c
+++ b/src/bin/lttng-sessiond/utils.c
@@ -16,39 +16,101 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
+#define _LGPL_SOURCE
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <common/error.h>
 
 #include "utils.h"
+#include "lttng-sessiond.h"
+
+int ht_cleanup_pipe[2] = { -1, -1 };
 
 /*
  * Write to writable pipe used to notify a thread.
  */
 int notify_thread_pipe(int wpipe)
 {
-       int ret;
+       ssize_t ret;
+
+       /* Ignore if the pipe is invalid. */
+       if (wpipe < 0) {
+               return 0;
+       }
 
-       ret = write(wpipe, "!", 1);
-       if (ret < 0) {
+       ret = lttng_write(wpipe, "!", 1);
+       if (ret < 1) {
                PERROR("write poll pipe");
        }
 
-       return ret;
+       return (int) ret;
 }
 
-/*
- * Return pointer to home directory path using the env variable HOME.
- *
- * No home, NULL is returned.
- */
-const char *get_home_dir(void)
+void ht_cleanup_push(struct lttng_ht *ht)
 {
-       return ((const char *) getenv("HOME"));
+       ssize_t ret;
+       int fd = ht_cleanup_pipe[1];
+
+       if (!ht) {
+               return;
+       }
+       if (fd < 0)
+               return;
+       ret = lttng_write(fd, &ht, sizeof(ht));
+       if (ret < sizeof(ht)) {
+               PERROR("write ht cleanup pipe %d", fd);
+               if (ret < 0) {
+                       ret = -errno;
+               }
+               goto error;
+       }
+
+       /* All good. Don't send back the write positive ret value. */
+       ret = 0;
+error:
+       assert(!ret);
+}
+
+int loglevels_match(int a_loglevel_type, int a_loglevel_value,
+       int b_loglevel_type, int b_loglevel_value, int loglevel_all_type)
+{
+       int match = 1;
+
+       if (a_loglevel_type == b_loglevel_type) {
+               /* Same loglevel type. */
+               if (b_loglevel_type != loglevel_all_type) {
+                       /*
+                        * Loglevel value must also match since the loglevel
+                        * type is not all.
+                        */
+                       if (a_loglevel_value != b_loglevel_value) {
+                               match = 0;
+                       }
+               }
+       } else {
+               /* Loglevel type is different: no match. */
+               match = 0;
+       }
+
+       return match;
+}
+
+const char *session_get_base_path(const struct ltt_session *session)
+{
+       struct consumer_output *consumer;
+
+       if (session->kernel_session) {
+               consumer = session->kernel_session->consumer;
+       } else if (session->ust_session) {
+               consumer = session->ust_session->consumer;
+       } else {
+               abort();
+       }
+
+       if (session->net_handle > 0) {
+               return consumer->dst.net.base_dir;
+       } else {
+               return consumer->dst.session_root_path;
+       }
 }