X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.c;h=85a1f0203ae0e9088653271192d13172bf03f566;hp=d0c8dd16f62571618db8118759d7a8ee4e650a76;hb=bd722d76b035766511f0b329f9bbaa2f4180c4ed;hpb=ef599319218f03ff160778e577cd8389a165f47c

diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c
index d0c8dd16f..85a1f0203 100644
--- a/src/bin/lttng-sessiond/utils.c
+++ b/src/bin/lttng-sessiond/utils.c
@@ -17,17 +17,15 @@
  */
 
 #define _GNU_SOURCE
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <common/error.h>
 
 #include "utils.h"
+#include "lttng-sessiond.h"
+
+int ht_cleanup_pipe[2] = { -1, -1 };
 
 /*
  * Write to writable pipe used to notify a thread.
@@ -36,94 +34,41 @@ int notify_thread_pipe(int wpipe)
 {
 	int ret;
 
-	ret = write(wpipe, "!", 1);
-	if (ret < 0) {
-		PERROR("write poll pipe");
+	/* Ignore if the pipe is invalid. */
+	if (wpipe < 0) {
+		return 0;
 	}
 
-	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"));
-}
-
-/*
- * Create a pipe in dst.
- */
-int utils_create_pipe(int *dst)
-{
-	int ret;
-
-	if (dst == NULL) {
-		return -1;
-	}
-
-	ret = pipe(dst);
+	do {
+		ret = write(wpipe, "!", 1);
+	} while (ret < 0 && errno == EINTR);
 	if (ret < 0) {
-		PERROR("create pipe");
+		PERROR("write poll pipe");
 	}
 
 	return ret;
 }
 
-/*
- * Create pipe and set CLOEXEC flag to both fd.
- *
- * Make sure the pipe opened by this function are closed at some point. Use
- * utils_close_pipe().
- */
-int utils_create_pipe_cloexec(int *dst)
+void ht_cleanup_push(struct lttng_ht *ht)
 {
-	int ret, i;
-
-	if (dst == NULL) {
-		return -1;
-	}
-
-	ret = utils_create_pipe(dst);
-	if (ret < 0) {
-		goto error;
-	}
+	int ret;
+	int fd = ht_cleanup_pipe[1];
 
-	for (i = 0; i < 2; i++) {
-		ret = fcntl(dst[i], F_SETFD, FD_CLOEXEC);
+	if (fd < 0)
+		return;
+	do {
+		ret = write(fd, &ht, sizeof(ht));
+	} while (ret < 0 && errno == EINTR);
+	if (ret < 0 || ret != sizeof(ht)) {
+		PERROR("write ht cleanup pipe %d", fd);
 		if (ret < 0) {
-			PERROR("fcntl pipe cloexec");
-			goto error;
+			ret = -errno;
 		}
+		goto error;
 	}
 
+	/* All good. Don't send back the write positive ret value. */
+	ret = 0;
 error:
-	return ret;
-}
-
-/*
- * Close both read and write side of the pipe.
- */
-void utils_close_pipe(int *src)
-{
-	int i, ret;
-
-	if (src == NULL) {
-		return;
-	}
-
-	for (i = 0; i < 2; i++) {
-		/* Safety check */
-		if (src[i] < 0) {
-			continue;
-		}
-
-		ret = close(src[i]);
-		if (ret) {
-			PERROR("close pipe");
-		}
-	}
+	assert(!ret);
 }