From 55bae674077139b78eeeb6c94361662ec2b2a8be Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 8 Mar 2024 12:27:07 -0500 Subject: [PATCH] having some issues with the allocator --- CMakeLists.txt | 2 +- include/blt/std/allocator.h | 33 +++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e1c727..c564d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) include(cmake/color.cmake) -set(BLT_VERSION 0.14.4) +set(BLT_VERSION 0.14.5) set(BLT_TEST_VERSION 0.0.1) set(BLT_TARGET BLT) diff --git a/include/blt/std/allocator.h b/include/blt/std/allocator.h index dbab0af..cd0db76 100644 --- a/include/blt/std/allocator.h +++ b/include/blt/std/allocator.h @@ -633,7 +633,8 @@ namespace blt if constexpr (USE_HUGE) { static_assert((BLOCK_SIZE & (HUGE_PAGE_SIZE - 1)) == 0 && "Must be multiple of the huge page size!"); - buffer = static_cast(mmap(nullptr, BLOCK_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0)); + buffer = static_cast(mmap(nullptr, BLOCK_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_POPULATE, -1, 0)); // if we fail to allocate a huge page we can try to allocate normally if (buffer == MAP_FAILED) { @@ -645,7 +646,7 @@ namespace blt "huge pages as this will allocate normal pages and double the memory usage!\033[22m\n"; } blt::size_t bytes = BLOCK_SIZE * 2; - buffer = static_cast(mmap(nullptr, bytes, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)); + buffer = static_cast(mmap(nullptr, bytes, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0)); if (buffer == MAP_FAILED) { BLT_ERROR_STREAM << "Failed to allocate normal pages\n"; @@ -681,15 +682,15 @@ namespace blt } template - T* allocate_back() + T* allocate_back(blt::size_t count) { blt::size_t remaining_bytes = BLOCK_SIZE - static_cast(head->metadata.offset - head->buffer); auto pointer = static_cast(head->metadata.offset); - const auto aligned_address = std::align(alignof(T), sizeof(T), pointer, remaining_bytes); + const auto aligned_address = std::align(alignof(T) * count, sizeof(T) * count, pointer, remaining_bytes); if (aligned_address != nullptr) { head->metadata.allocated_objects++; - head->metadata.offset = static_cast(aligned_address) + sizeof(T); + head->metadata.offset = static_cast(aligned_address) + sizeof(T) * count; } return static_cast(aligned_address); } @@ -708,13 +709,14 @@ namespace blt } template - inline T* attempt_allocation(FUNC f) + inline T* attempt_allocation(FUNC f, blt::size_t count) { - T* ptr = allocate_back(); + T* ptr = allocate_back(count); if (ptr == nullptr) f(); return ptr; } + public: bump_allocator() { @@ -728,14 +730,14 @@ namespace blt {} template - [[nodiscard]] T* allocate() + [[nodiscard]] T* allocate(blt::size_t count = 1) { if constexpr (sizeof(T) > BLOCK_SIZE) throw std::bad_alloc(); - auto* ptr = attempt_allocation([this]() {allocate_forward();}); + auto* ptr = attempt_allocation([this]() { allocate_forward(); }, count); if (ptr == nullptr) - return attempt_allocation([]() {throw std::bad_alloc();}); + return attempt_allocation([]() { throw std::bad_alloc(); }, count); return ptr; } @@ -763,6 +765,17 @@ namespace blt return new(allocated_memory) T{std::forward(args)...}; } + template + [[nodiscard]] T* emplace_many(blt::size_t count, Args&& ... args) + { + if (count == 0) + return nullptr; + const auto allocated_memory = allocate(count); + for (blt::size_t i = 0; i < count; i++) + new(allocated_memory + i) T{std::forward(args)...}; + return allocated_memory; + } + template inline void construct(U* p, Args&& ... args) {