fix: relayd: unaligned access in trace_chunk_registry_ht_key_hash

[lttng-tools.git] / src / bin / lttng-relayd / tracefile-array.cpp

diff --git a/src/bin/lttng-relayd/tracefile-array.cpp b/src/bin/lttng-relayd/tracefile-array.cpp
index 05012b642cc40f6f6c913806e808b56d488e45d5..91baa74aa9f6e0248db2e61ffd236e8069af63b0 100644 (file)
--- a/src/bin/lttng-relayd/tracefile-array.cpp
+++ b/src/bin/lttng-relayd/tracefile-array.cpp
@@ -6,22 +6,22 @@
  */
 
 #define _LGPL_SOURCE
-#include <common/common.h>
-#include <common/utils.h>
-#include <common/defaults.h>
+#include "tracefile-array.hpp"
 
-#include "tracefile-array.h"
+#include <common/common.hpp>
+#include <common/defaults.hpp>
+#include <common/utils.hpp>
 
 struct tracefile_array *tracefile_array_create(size_t count)
 {
-       struct tracefile_array *tfa = NULL;
+       struct tracefile_array *tfa = nullptr;
        int i;
 
-       tfa = (tracefile_array *) zmalloc(sizeof(*tfa));
+       tfa = zmalloc<tracefile_array>();
        if (!tfa) {
                goto error;
        }
-       tfa->tf = (tracefile *) zmalloc(sizeof(*tfa->tf) * count);
+       tfa->tf = calloc<tracefile>(count);
        if (!tfa->tf) {
                goto error;
        }
@@ -39,7 +39,7 @@ error:
                free(tfa->tf);
        }
        free(tfa);
-       return NULL;
+       return nullptr;
 }
 
 void tracefile_array_destroy(struct tracefile_array *tfa)
@@ -67,8 +67,7 @@ void tracefile_array_reset(struct tracefile_array *tfa)
        tfa->file_tail = 0;
 }
 
-void tracefile_array_file_rotate(struct tracefile_array *tfa,
-               enum tracefile_rotate_type type)
+void tracefile_array_file_rotate(struct tracefile_array *tfa, enum tracefile_rotate_type type)
 {
        uint64_t *headp, *tailp;
 
@@ -109,8 +108,7 @@ void tracefile_array_file_rotate(struct tracefile_array *tfa,
        }
 }
 
-void tracefile_array_commit_seq(struct tracefile_array *tfa,
-               uint64_t new_seq_head)
+void tracefile_array_commit_seq(struct tracefile_array *tfa, uint64_t new_seq_head)
 {
        uint64_t *headp, *tailp;
 
@@ -157,8 +155,7 @@ uint64_t tracefile_array_get_seq_tail(struct tracefile_array *tfa)
        return tfa->seq_tail;
 }
 
-bool tracefile_array_seq_in_file(struct tracefile_array *tfa,
-               uint64_t file_index, uint64_t seq)
+bool tracefile_array_seq_in_file(struct tracefile_array *tfa, uint64_t file_index, uint64_t seq)
 {
        if (!tfa->count) {
                /*
@@ -171,10 +168,5 @@ bool tracefile_array_seq_in_file(struct tracefile_array *tfa,
        if (seq == -1ULL) {
                return false;
        }
-       if (seq >= tfa->tf[file_index].seq_tail
-                       && seq <= tfa->tf[file_index].seq_head) {
-               return true;
-       } else {
-               return false;
-       }
+       return seq >= tfa->tf[file_index].seq_tail && seq <= tfa->tf[file_index].seq_head;
 }