Clean up allocator tags

Author: Chaosvex

src/libs/core/allocators/include/allocators/BlockAllocator.h

@@ -73,6 +73,8 @@ template<typename _ty,
 	typename UseAllocator = DefaultBlockAllocator
 >
 class BlockAllocator {
+	static constexpr std::string_view default_tag { "block_allocator" };
+
 	using tid_type = std::conditional_t<
 		std::is_same_v<ValidatePolicy, ValidateDealloc>, std::thread::id, std::monostate
 	>;
@@ -181,13 +183,13 @@ class BlockAllocator {
 	std::size_t total_deallocs = 0;
 #endif
 
-	BlockAllocator(std::size_t elements, std::string_view tag = {}) requires std::same_as<ValidatePolicy, ValidateDealloc>
+	BlockAllocator(std::size_t elements, std::string_view tag = default_tag) requires std::same_as<ValidatePolicy, ValidateDealloc>
 		: tag_(tag)
 		, thread_id_(std::this_thread::get_id()) {
 		initialise(elements);
 	}
 
-	BlockAllocator(std::size_t elements, std::string_view tag = {})
+	BlockAllocator(std::size_t elements, std::string_view tag = default_tag)
 		: tag_(tag) {
 		initialise(elements);
 	}
@@ -219,7 +221,7 @@ class BlockAllocator {
 		++total_allocs;
 		++active_count;
 #endif
-		ALLOC_TRACK(tag_, mem_rep_bytes_alloc, sizeof(Block));
+		ALLOC_TRACK(tag_, mem_rep_bytes_alloc, sizeof(_ty));
 		return new (&block->obj) _ty(std::forward<Args>(args)...);
 	}
 
@@ -252,7 +254,7 @@ class BlockAllocator {
 		++total_deallocs;
 		--active_count;
 #endif
-		ALLOC_TRACK(tag_, mem_rep_bytes_dealloc, sizeof(Block));
+		ALLOC_TRACK(tag_, mem_rep_bytes_dealloc, sizeof(_ty));
 	}
 
 	std::string_view tag() const {

src/libs/core/allocators/include/allocators/StaticAllocator.h

@@ -19,7 +19,8 @@ namespace ember::allocators {
 
 template<std::size_t _size, std::size_t _elements>
 class StaticAllocator final {
-	static constexpr std::string_view tag { "asio_static" };
+	static constexpr std::string_view default_tag { "static_allocator" };
+	static constexpr std::string_view block_tag   { "static_allocator_block" };
 
 	struct alignas(std::max_align_t) AlignedStorage {
 		std::byte storage[_size];
@@ -31,7 +32,7 @@ class StaticAllocator final {
 	>;
 
 	class SlabAllocator {
-		static constexpr std::string_view tag { "asio_static_slab" };
+		static constexpr std::string_view tag { "static_slab_allocator" };
 		static constexpr std::size_t slab_size = BlockAllocator<>::block_size * _elements;
 
 		alignas(std::max_align_t) std::array<std::byte, slab_size> storage;
@@ -73,22 +74,22 @@ class StaticAllocator final {
 	};
 
 	BlockAllocator<SlabAllocator> allocator;
+	std::string_view tag;
 
 public:
-	StaticAllocator()
-		: allocator(_elements, tag) {
-		ALLOC_TRACK(tag, mem_rep_create);
-	}
-
-	StaticAllocator(std::string_view tag)
-		: allocator(_elements, tag) {
+	StaticAllocator(std::string_view tag = default_tag)
+		: allocator(_elements, block_tag)
+		, tag(tag) {
 		ALLOC_TRACK(tag, mem_rep_create);
 	}
 
 	~StaticAllocator() {
 		ALLOC_TRACK(tag, mem_rep_destroy);
 	}
 
+	StaticAllocator(const StaticAllocator&) = delete;
+	StaticAllocator& operator=(const StaticAllocator&) = delete;
+
 	void* allocate(std::size_t size) {
 		ALLOC_TRACK(tag, mem_rep_bytes_alloc, size);
 

src/libs/core/allocators/include/allocators/TLSBlockAllocator.h

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <allocators/AllocTrack.h>
 #include <allocators/BlockAllocator.h>
 #include <type_traits>
 #include <utility>

src/realm/ClientConnection.h

@@ -33,12 +33,12 @@ namespace ember::realm {
 class ClientHandler;
 
 class ClientConnection final {
+	static constexpr std::string_view allocator_tag { "realm_client_connection" };
+
 public:
 	static constexpr auto key_size = 40;
 
 private:
-	static constexpr std::string_view allocator_tag { "realm_client_connection "};
-
 	enum class ReadState {
 		header,
 		body,
@@ -52,7 +52,7 @@ class ClientConnection final {
 	std::array<DynamicTLSBuffer, 2> outbound_buffers_;
 	DynamicTLSBuffer* outbound_front_;
 	DynamicTLSBuffer* outbound_back_;
-	StaticChunkAllocator allocator_;
+	StaticAllocator allocator_;
 
 	ClientHandler* handler_;
 	ConnectionStats stats_;

src/realm/ConnectionDefines.h

@@ -38,10 +38,10 @@ using DynamicTLSBuffer = spark::io::DynamicTLSBuffer<
 	outbound_size, prealloc_nodes, allocators::NoRefCounting, allocators::UnsafeEntrant
 >;
 
-using StaticChunkAllocator = allocators::StaticAllocator<asio_chunk_size, asio_chunks>;
+using StaticAllocator = allocators::StaticAllocator<asio_chunk_size, asio_chunks>;
 
 template<typename T>
-using AsioStaticAllocator = allocators::AsioAllocator<T, StaticChunkAllocator>;
+using AsioStaticAllocator = allocators::AsioAllocator<T, StaticAllocator>;
 
 template<typename _ty>
 using message_view = protocol::message_view<_ty, BinaryStream>;

src/realm/commands/Connections.cpp

@@ -99,7 +99,7 @@ void print_connection_stats_header(bprinter::TablePrinter& table) {
 	table.AddColumn("Bytes In", 8);
 	table.AddColumn("Bytes Out", 9);
 	table.AddColumn("Ops In", 6);
-	table.AddColumn("Opts Out", 8);
+	table.AddColumn("Ops Out", 8);
 	table.PrintHeader();
 }