X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.c;h=e806082e324678c026a5e112ac7b2d3e28ccc272;hp=f77a21ddb153a5ebdd88815af3e9850e37736151;hb=bae46a81520110e52c5af423ce712b9099fe23dd;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9

diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c
index f77a21ddb..e806082e3 100644
--- a/src/bin/lttng-sessiond/utils.c
+++ b/src/bin/lttng-sessiond/utils.c
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -23,9 +13,10 @@
 #include <common/error.h>
 
 #include "utils.h"
+#include "snapshot.h"
 #include "lttng-sessiond.h"
 
-int ht_cleanup_pipe[2] = { -1, -1 };
+int the_ht_cleanup_pipe[2] = {-1, -1};
 
 /*
  * Write to writable pipe used to notify a thread.
@@ -50,7 +41,7 @@ int notify_thread_pipe(int wpipe)
 void ht_cleanup_push(struct lttng_ht *ht)
 {
 	ssize_t ret;
-	int fd = ht_cleanup_pipe[1];
+	int fd = the_ht_cleanup_pipe[1];
 
 	if (!ht) {
 		return;
@@ -95,3 +86,15 @@ 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 consumer_output_get_base_path(session->consumer);
+}
+
+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;
+}