X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.c;h=51fdc99335054362e7a08011ba467cfe26bab1b6;hb=d295668767ac8234e83984e1812d342d03293d88;hp=d676198208fe638c2efb8f33b62f023ee39958ee;hpb=fc41443f7ee5fa95a942d0aedd61c75d622697b5;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c
index d67619820..51fdc9933 100644
--- 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,18 @@ 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;
+}
+
+const char *snapshot_output_get_base_path(
+		const struct snapshot_output *snapshot_output)
+{
+	return snapshot_output->consumer->type == CONSUMER_DST_LOCAL ?
+			snapshot_output->consumer->dst.session_root_path :
+			snapshot_output->consumer->dst.net.base_dir;
+}