fdsdump: abstract away allocator choice

Author: sedmicha

src/tools/fdsdump/src/aggregator/allocator.hpp

@@ -0,0 +1,33 @@
+/**
+ * @file
+ * @author Michal Sedlak <[email protected]>
+ * @brief Select allocator implementation
+ */
+
+#pragma once
+
+#ifndef FDSDUMP_USE_STD_ALLOCATOR
+
+#include <aggregator/arenaAllocator.hpp>
+
+namespace fdsdump {
+namespace aggregator {
+
+using Allocator = ArenaAllocator;
+
+} // aggregator
+} // fdsdump
+
+#else
+
+#include <aggregator/stdAllocator.hpp>
+
+namespace fdsdump {
+namespace aggregator {
+
+using Allocator = StdAllocator;
+
+} // aggregator
+} // fdsdump
+
+#endif

src/tools/fdsdump/src/aggregator/fastHashTable.hpp

@@ -7,7 +7,7 @@
 
 #ifdef __SSE2__
 
-#include <aggregator/arenaAllocator.hpp>
+#include <aggregator/allocator.hpp>
 
 #include <cstdint>
 #include <vector>
@@ -75,7 +75,7 @@ class FastHashTable {
     std::vector<HashTableBlock> m_blocks;
     std::vector<uint8_t *> m_items;
 
-    ArenaAllocator m_allocator;
+    Allocator m_allocator;
 
     bool
     lookup(uint8_t *key, uint8_t *&item, bool create_if_not_found);

src/tools/fdsdump/src/aggregator/stdHashTable.hpp

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "stdAllocator.hpp"
+#include "allocator.hpp"
 
 #include <cstdint>
 #include <functional>
@@ -66,7 +66,7 @@ class StdHashTable {
     std::size_t m_key_size;
     std::size_t m_value_size;
     std::vector<uint8_t *> m_items;
-    StdAllocator m_allocator;
+    Allocator m_allocator;
     Map m_map;
 };