X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.c;h=f5f1cff638810207d17086f88a9af6b89fea768d;hp=358e407e9c326cf038024b570f4c9209a724e2ca;hb=19a97244f801504a7985eee1b4ecca933f660b4a;hpb=0b2dc8df2a6d7b3341a72a04767dd6328907c97c

diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c
index 358e407e9..f5f1cff63 100644
--- a/src/bin/lttng-sessiond/utils.c
+++ b/src/bin/lttng-sessiond/utils.c
@@ -17,6 +17,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdlib.h>
 #include <unistd.h>
 
@@ -32,44 +33,33 @@ int ht_cleanup_pipe[2] = { -1, -1 };
  */
 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 pointer to home directory path using the env variable HOME.
- *
- * No home, NULL is returned.
- */
-const char *get_home_dir(void)
-{
-	return ((const char *) getenv("HOME"));
+	return (int) ret;
 }
 
 void ht_cleanup_push(struct lttng_ht *ht)
 {
-	int ret;
+	ssize_t ret;
 	int fd = ht_cleanup_pipe[1];
 
+	if (!ht) {
+		return;
+	}
 	if (fd < 0)
 		return;
-	do {
-		ret = write(fd, &ht, sizeof(ht));
-	} while (ret < 0 && errno == EINTR);
-	if (ret < 0 || ret != sizeof(ht)) {
+	ret = lttng_write(fd, &ht, sizeof(ht));
+	if (ret < sizeof(ht)) {
 		PERROR("write ht cleanup pipe %d", fd);
 		if (ret < 0) {
 			ret = -errno;
@@ -82,3 +72,27 @@ void ht_cleanup_push(struct lttng_ht *ht)
 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;
+}