X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.c;h=38082f639dba92024467f7c22e1252569cfb8350;hb=6710e5aab2de1a7e53d4550f07b782c4566f13a5;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..38082f639 100644
--- 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;
+}