fix: relayd: unaligned access in trace_chunk_registry_ht_key_hash

[lttng-tools.git] / src / bin / lttng-sessiond / utils.cpp

diff --git a/src/bin/lttng-sessiond/utils.cpp b/src/bin/lttng-sessiond/utils.cpp
index 5b33a8df8a313320b6b4338e7686330a5b41b65a..b4d3c00a498b2644d34c7b7bccdf9a26d1ee2938 100644 (file)
--- a/src/bin/lttng-sessiond/utils.cpp
+++ b/src/bin/lttng-sessiond/utils.cpp
@@ -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;
 }