roland/xo-alloc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-alloc2: AAllocator.expand() working

Browse source
This commit is contained in:
Roland Conybeare 2025-12-12 11:38:48 -05:00
commit 24109a9e11
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
xo-alloc2/src/alloc2/CMakeLists.txt
View file

@ -11,3 +11,4 @@ set(SELF_SRCS
xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS}) xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})
# note: deps here must also appear in cmake/xo_alloc2Config.cmake.in # note: deps here must also appear in cmake/xo_alloc2Config.cmake.in
xo_dependency(${SELF_LIB} xo_facet) xo_dependency(${SELF_LIB} xo_facet)
xo_dependency(${SELF_LIB} indentlog)

18
xo-alloc2/src/alloc2/IAllocator_DArena.cpp
View file

@ -5,6 +5,7 @@
#include "IAllocator_DArena.hpp" #include "IAllocator_DArena.hpp"
#include "padding.hpp" #include "padding.hpp"
#include "xo/indentlog/scope.hpp"
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <sys/mman.h> #include <sys/mman.h>
@ -42,20 +43,21 @@ namespace xo {
bool bool
IAllocator_DArena::expand(DArena & s, size_t target_z) IAllocator_DArena::expand(DArena & s, size_t target_z)
{ {
// scope log(XO_DEBUG(debug_flag_), scope log(XO_DEBUG(s.config_.debug_flag_),
// xtag("offset_z", offset_z), xtag("target_z", target_z),
// xtag("committed_z", committed_z_)); xtag("committed_z", s.committed_z_));
if (target_z <= s.committed_z_) { if (target_z <= s.committed_z_) {
// log && log("trivial success, offset within committed range", log && log("trivial success, offset within committed range",
// xtag("offset_z", offset_z), xtag("target_z", target_z),
// xtag("committed_z", committed_z_)); xtag("committed_z", s.committed_z_));
return true; return true;
} }
if (s.lo_ + target_z > s.hi_) { if (s.lo_ + target_z > s.hi_) {
// throw std::runtime_error(tostr("ArenaAlloc::expand: requested size exceeds reserved size", throw std::runtime_error(tostr("ArenaAlloc::expand: requested size exceeds reserved size",
// xtag("requested", offset_z), xtag("reserved", reserved()))); xtag("requested", target_z),
xtag("reserved", reserved(s))));
return false; return false;
} }

12
xo-alloc2/utest/arena.test.cpp
View file

@ -10,6 +10,7 @@
#include "xo/alloc2/IAllocator_DArena.hpp" #include "xo/alloc2/IAllocator_DArena.hpp"
#include "xo/alloc2/RAllocator.hpp" #include "xo/alloc2/RAllocator.hpp"
#include "xo/alloc2/padding.hpp" #include "xo/alloc2/padding.hpp"
#include "xo/indentlog/scope.hpp"
#include "xo/facet/obj.hpp" #include "xo/facet/obj.hpp"
#include <catch2/catch.hpp> #include <catch2/catch.hpp>
@ -20,6 +21,7 @@ namespace xo {
using xo::mm::DArena; using xo::mm::DArena;
using xo::mm::ArenaConfig; using xo::mm::ArenaConfig;
using xo::facet::obj; using xo::facet::obj;
using xo::scope;
using std::byte; using std::byte;
using std::size_t; using std::size_t;
@ -107,13 +109,19 @@ namespace xo {
{ {
/* typed allocator a1o */ /* typed allocator a1o */
ArenaConfig cfg { .name_ = "testarena", ArenaConfig cfg { .name_ = "testarena",
.size_ = 1 }; .size_ = 1,
.debug_flag_ = false };
DArena arena = DArena::map(cfg); DArena arena = DArena::map(cfg);
obj<AAllocator, DArena> a1o{&arena}; obj<AAllocator, DArena> a1o{&arena};
a1o.expand(3*1024*1024); size_t z2 = 512;
REQUIRE(a1o.expand(z2));
REQUIRE(a1o.reserved() % cfg.hugepage_z_ == 0); REQUIRE(a1o.reserved() % cfg.hugepage_z_ == 0);
REQUIRE(a1o.committed() >= z2);
REQUIRE(a1o.committed() % cfg.hugepage_z_ == 0);
/* .size() is synonym for .committed() */
REQUIRE(a1o.size() == a1o.committed());
#ifdef NOPE #ifdef NOPE
byte * m = a1o.alloc(1); byte * m = a1o.alloc(1);