X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.c;h=978af5883e2fe0b532897379ca0bd3486ddf7e3b;hb=4605890e0a926f1c88355051dcd6d8a8dd135c58;hp=99ec7772bfcf849da5730c5aeca3e7924e870261;hpb=a1ae2ea59428174575b7328b1062a6248d636b72;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c
index 99ec7772b..978af5883 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 };
@@ -98,19 +99,12 @@ int loglevels_match(int a_loglevel_type, int a_loglevel_value,
 
 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();
-	}
+	return consumer_output_get_base_path(session->consumer);
+}
 
-	if (session->net_handle > 0) {
-		return consumer->dst.net.base_dir;
-	} else {
-		return consumer->dst.session_root_path;
-	}
+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;
 }