From bfb7b04ce5408053ce26fa9fa916809aa2132726 Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 6 Mar 2024 23:52:43 -0500 Subject: [PATCH] no more annoying warnings, just enable THB --- include/blt/std/allocator.h | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/include/blt/std/allocator.h b/include/blt/std/allocator.h index 3a879e0..3cb9c4e 100644 --- a/include/blt/std/allocator.h +++ b/include/blt/std/allocator.h @@ -539,7 +539,7 @@ namespace blt } }; - template + template class bump_allocator2 { // power of two @@ -634,10 +634,13 @@ namespace blt // if we fail to allocate a huge page we can try to allocate normally if (buffer == MAP_FAILED) { - BLT_WARN_STREAM << "We failed to allocate huge pages\n"; - handle_mmap_error(BLT_WARN_STREAM); - BLT_WARN_STREAM << "\033[1;31mYou should attempt to enable " - "huge pages as this will allocate normal pages and double the memory usage!\033[22m\n"; + if constexpr (WARN_ON_FAIL) + { + BLT_WARN_STREAM << "We failed to allocate huge pages\n"; + handle_mmap_error(BLT_WARN_STREAM); + BLT_WARN_STREAM << "\033[1;31mYou should attempt to enable " + "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)); if (buffer == MAP_FAILED) @@ -646,12 +649,16 @@ namespace blt handle_mmap_error(BLT_ERROR_STREAM); throw std::bad_alloc(); } - if (((size_t)buffer & (HUGE_PAGE_SIZE - 1)) != 0) - BLT_ERROR("Pointer is not aligned! %p", buffer); + if constexpr (WARN_ON_FAIL) + { + if (((size_t) buffer & (HUGE_PAGE_SIZE - 1)) != 0) + BLT_ERROR("Pointer is not aligned! %p", buffer); + } auto* ptr = static_cast(buffer); auto ptr_size = reinterpret_cast(ptr); buffer = static_cast(std::align(BLOCK_SIZE, BLOCK_SIZE, ptr, bytes)); - BLT_ERROR("Offset by %ld pages, resulting: %p", (reinterpret_cast(buffer) - ptr_size) / 4096, buffer); + if constexpr (WARN_ON_FAIL) + BLT_ERROR("Offset by %ld pages, resulting: %p", (reinterpret_cast(buffer) - ptr_size) / 4096, buffer); } } else buffer = reinterpret_cast(std::aligned_alloc(BLOCK_SIZE, BLOCK_SIZE)); @@ -693,7 +700,7 @@ namespace blt BLT_ERROR_STREAM << "FAILED TO DEALLOCATE BLOCK\n"; handle_mmap_error(BLT_ERROR_STREAM); } - }else + } else free(p); }