X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.cpp;h=f3446bc26c5b660a18e2611617f6c2fb4e7ce17b;hp=6936a03f963de2d0d37a18040f39fbd32b99d2a1;hb=HEAD;hpb=7966af5763c4aaca39df9bbfa9277ff15715c720

diff --git a/src/bin/lttng-sessiond/utils.cpp b/src/bin/lttng-sessiond/utils.cpp
index 6936a03f9..b4d3c00a4 100644
--- a/src/bin/lttng-sessiond/utils.cpp
+++ b/src/bin/lttng-sessiond/utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * SPDX-License-Identifier: GPL-2.0-only
@@ -7,16 +7,14 @@
  */
 
 #define _LGPL_SOURCE
-#include <stdlib.h>
-#include <unistd.h>
+#include "lttng-sessiond.hpp"
+#include "snapshot.hpp"
+#include "utils.hpp"
 
-#include <common/error.h>
+#include <common/error.hpp>
 
-#include "utils.h"
-#include "snapshot.h"
-#include "lttng-sessiond.h"
-
-int the_ht_cleanup_pipe[2] = {-1, -1};
+#include <stdlib.h>
+#include <unistd.h>
 
 /*
  * Write to writable pipe used to notify a thread.
@@ -32,39 +30,18 @@ int notify_thread_pipe(int wpipe)
 
 	ret = lttng_write(wpipe, "!", 1);
 	if (ret < 1) {
-		PERROR("write poll pipe");
+		ret = -1;
+		PERROR("Failed to write to thread pipe");
 	}
 
 	return (int) ret;
 }
 
-void ht_cleanup_push(struct lttng_ht *ht)
-{
-	ssize_t ret;
-	int fd = the_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:
-	LTTNG_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 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;
 
@@ -94,7 +71,6 @@ const char *session_get_base_path(const struct ltt_session *session)
 
 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;
+	return output->type == CONSUMER_DST_LOCAL ? output->dst.session_root_path :
+						    output->dst.net.base_dir;
 }