Generate session name and default output on sessiond's end

[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..38082f639dba92024467f7c22e1252569cfb8350 100644 (file)
--- a/src/bin/lttng-sessiond/utils.c
+++ b/src/bin/lttng-sessiond/utils.c
@@ -55,7 +55,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 +95,10 @@ 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 session->net_handle > 0 ?
+                       session->consumer->dst.net.base_dir :
+                       session->consumer->dst.session_root_path;
+}