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 51fdc99335054362e7a08011ba467cfe26bab1b6..978af5883e2fe0b532897379ca0bd3486ddf7e3b 100644 (file)
--- a/src/bin/lttng-sessiond/utils.c
+++ b/src/bin/lttng-sessiond/utils.c
@@ -99,15 +99,12 @@ int loglevels_match(int a_loglevel_type, int a_loglevel_value,
 
 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;
+       return consumer_output_get_base_path(session->consumer);
 }
 
-const char *snapshot_output_get_base_path(
-               const struct snapshot_output *snapshot_output)
+const char *consumer_output_get_base_path(const struct consumer_output *output)
 {
-       return snapshot_output->consumer->type == CONSUMER_DST_LOCAL ?
-                       snapshot_output->consumer->dst.session_root_path :
-                       snapshot_output->consumer->dst.net.base_dir;
+       return output->type == CONSUMER_DST_LOCAL ?
+                       output->dst.session_root_path :
+                       output->dst.net.base_dir;
 }