X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.c;h=f84859fc621645aea1939d7c04648c7ac729682a;hp=d503665a4fdb1149d68b00b79fcab14ed948bd4d;hb=505b2d90aa87592186ecc2a119cf67fb3f90d168;hpb=6f94560a050962daad560dac2823bd97b0b1bf98

diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c
index d503665a4..f84859fc6 100644
--- a/src/bin/lttng-sessiond/utils.c
+++ b/src/bin/lttng-sessiond/utils.c
@@ -1,52 +1,100 @@
 /*
- * 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 _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdlib.h>
 #include <unistd.h>
 
 #include <common/error.h>
 
 #include "utils.h"
+#include "snapshot.h"
+#include "lttng-sessiond.h"
+
+int ht_cleanup_pipe[2] = { -1, -1 };
 
 /*
  * Write to writable pipe used to notify a thread.
  */
 int notify_thread_pipe(int wpipe)
 {
-	int ret;
+	ssize_t ret;
+
+	/* Ignore if the pipe is invalid. */
+	if (wpipe < 0) {
+		return 0;
+	}
 
-	do {
-		ret = write(wpipe, "!", 1);
-	} while (ret < 0 && errno == EINTR);
-	if (ret < 0) {
+	ret = lttng_write(wpipe, "!", 1);
+	if (ret < 1) {
 		PERROR("write poll pipe");
 	}
 
-	return ret;
+	return (int) ret;
 }
 
-/*
- * Return pointer to home directory path using the env variable HOME.
- *
- * No home, NULL is returned.
- */
-const char *get_home_dir(void)
+void ht_cleanup_push(struct lttng_ht *ht)
+{
+	ssize_t ret;
+	int fd = ht_cleanup_pipe[1];
+
+	if (!ht) {
+		return;
+	}
+	if (fd < 0)
+		return;
+	ret = lttng_write(fd, &ht, sizeof(ht));
+	if (ret < sizeof(ht)) {
+		PERROR("write ht cleanup pipe %d", fd);
+		if (ret < 0) {
+			ret = -errno;
+		}
+		goto error;
+	}
+
+	/* All good. Don't send back the write positive ret value. */
+	ret = 0;
+error:
+	assert(!ret);
+}
+
+int loglevels_match(int a_loglevel_type, int a_loglevel_value,
+	int b_loglevel_type, int b_loglevel_value, int loglevel_all_type)
+{
+	int match = 1;
+
+	if (a_loglevel_type == b_loglevel_type) {
+		/* Same loglevel type. */
+		if (b_loglevel_type != loglevel_all_type) {
+			/*
+			 * Loglevel value must also match since the loglevel
+			 * type is not all.
+			 */
+			if (a_loglevel_value != b_loglevel_value) {
+				match = 0;
+			}
+		}
+	} else {
+		/* Loglevel type is different: no match. */
+		match = 0;
+	}
+
+	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 ((const char *) getenv("HOME"));
+	return output->type == CONSUMER_DST_LOCAL ?
+			output->dst.session_root_path :
+			output->dst.net.base_dir;
 }