relayd: create stream files relative to a session's trace chunk

[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 d676198208fe638c2efb8f33b62f023ee39958ee..978af5883e2fe0b532897379ca0bd3486ddf7e3b 100644 (file)
--- a/src/bin/lttng-sessiond/utils.c
+++ b/src/bin/lttng-sessiond/utils.c
@@ -23,6 +23,7 @@
 #include <common/error.h>
 
 #include "utils.h"
+#include "snapshot.h"
 #include "lttng-sessiond.h"
 
 int ht_cleanup_pipe[2] = { -1, -1 };
@@ -55,7 +56,8 @@ void ht_cleanup_push(struct lttng_ht *ht)
        if (!ht) {
                return;
        }
-       assert(fd >= 0);
+       if (fd < 0)
+               return;
        ret = lttng_write(fd, &ht, sizeof(ht));
        if (ret < sizeof(ht)) {
                PERROR("write ht cleanup pipe %d", fd);
@@ -94,3 +96,15 @@ int loglevels_match(int a_loglevel_type, int a_loglevel_value,
 
        return match;
 }
+
+const char *session_get_base_path(const struct ltt_session *session)
+{
+       return consumer_output_get_base_path(session->consumer);
+}
+
+const char *consumer_output_get_base_path(const struct consumer_output *output)
+{
+       return output->type == CONSUMER_DST_LOCAL ?
+                       output->dst.session_root_path :
+                       output->dst.net.base_dir;
+}