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

xo-gc stack: coverage improvement + related tidying

Browse source
This commit is contained in:
Roland Conybeare 2026-05-11 09:27:24 -04:00
commit eea239d6ad
14 changed files with 287 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xo-alloc2/include/xo/alloc2/alloc/IAllocator_Any.hpp
View file

@ -35,6 +35,8 @@ namespace xo {
// builtin methods
typeseq _typeseq() const noexcept override { return s_typeseq; }
// LCOV_EXCL_START
void _drop(Opaque) const noexcept override { _fatal(); }
// const methods
@ -58,9 +60,6 @@ namespace xo {
[[noreturn]] value_type alloc(Opaque, typeseq, std::size_t) const override { _fatal(); }
[[noreturn]] value_type super_alloc(Opaque, typeseq, std::size_t) const override { _fatal(); }
[[noreturn]] value_type sub_alloc(Opaque, std::size_t, bool) const override { _fatal(); }
#ifdef OBSOLETE
[[noreturn]] value_type alloc_copy(Opaque, value_type) const override { _fatal(); }
#endif
[[noreturn]] void clear(Opaque) const override { _fatal(); }
[[noreturn]] void barrier_assign_aux(Opaque,
void *,
@ -69,6 +68,7 @@ namespace xo {
private:
[[noreturn]] static void _fatal();
// LCOV_EXCL_STOP
public:
static typeseq s_typeseq;

2
xo-alloc2/include/xo/alloc2/arena/IAllocator_DArena.hpp
View file

@ -78,7 +78,7 @@ namespace xo {
void * parent,
AGCObject * lhs_iface, void ** lhs_data,
AGCObject * rhs_iface, void * rhs_data);
static void destruct_data(DArena &);
//static void destruct_data(DArena &);
};
// template <>

1
xo-alloc2/include/xo/alloc2/gc/RCollector.hpp
View file

@ -91,6 +91,7 @@ public:
}
// builtin methods
bool _has_null_vptr() const noexcept { return O::iface()->_has_null_vptr(); }
typeseq _typeseq() const noexcept { return O::iface()->_typeseq(); }
void _drop() const noexcept { O::iface()->_drop(O::data()); }

2
xo-alloc2/src/alloc2/IAllocator_Any.cpp
View file

@ -14,6 +14,7 @@ namespace xo {
namespace mm {
// LCOV_EXCL_START
void
IAllocator_Any::_fatal()
{
@ -29,6 +30,7 @@ namespace xo {
std::terminate();
}
// LCOV_EXCL_STOP
typeseq
IAllocator_Any::s_typeseq = typeseq::id<DVariantPlaceholder>();

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

@ -173,11 +173,13 @@ namespace xo {
*lhs_data = rhs_data;
}
#ifdef OBSOLETE
void
IAllocator_DArena::destruct_data(DArena & s)
{
s.~DArena();
}
#endif
} /*namespace mm*/
} /*namespace xo*/

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

@ -6,6 +6,7 @@ set(UTEST_SRCS
alloc2_utest_main.cpp
objectmodel.test.cpp
arena.test.cpp
IAllocator_Any.test.cpp
DArenaIterator.test.cpp
# Collector.test.cpp
# DX1CollectorIterator.test.cpp

29
xo-alloc2/utest/IAllocator_Any.test.cpp Normal file
View file

@ -0,0 +1,29 @@
/** @file IAllocator_Any.test.cpp
*
* @author Roland Conybeare, May 2026
**/
#include <xo/alloc2/Allocator.hpp>
#include <catch2/catch.hpp>
#include <sys/wait.h>
#include <unistd.h>
#include <signal.h>
namespace xo {
using xo::mm::AAllocator;
namespace ut {
TEST_CASE("IAllocator_Any", "[alloc2][death]")
{
// null allocator
obj<AAllocator> alloc_any;
// NOTE: tried using a fork() strategy to verify termination,
// but child process doesn't get measured by gcov
}
} /*namespace ut*/
} /*namespace xo*/
/* end IAllocator_Any.test.cpp */

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

@ -97,6 +97,8 @@ namespace xo {
//obj<AAllocator, DArena> a1o{&arena};
auto a1o = with_facet<AAllocator>::mkobj(&arena);
REQUIRE(!a1o._has_null_vptr());
REQUIRE(a1o);
REQUIRE(a1o.iface() != nullptr);
REQUIRE(a1o.data() != nullptr);
@ -110,6 +112,12 @@ namespace xo {
REQUIRE(a1o.size() == 0);
REQUIRE(a1o.committed() == 0);
REQUIRE(a1o.allocated() == 0);
a1o._drop();
{
REQUIRE(a1o.allocated() == 0);
REQUIRE(a1o.committed() == 0);
}
}
TEST_CASE("allocator-expand-1", "[alloc2][AAllocator]")
@ -122,6 +130,8 @@ namespace xo {
//obj<AAllocator, DArena> a1o{&arena};
auto a1o = with_facet<AAllocator>::mkobj(&arena);
REQUIRE(!a1o._has_null_vptr());
REQUIRE(a1o.available() == 0);
REQUIRE(a1o.allocated() == 0);
@ -141,6 +151,11 @@ namespace xo {
REQUIRE(a1o.available() == a1o.committed());
REQUIRE(a1o.allocated() == 0);
a1o._drop();
{
REQUIRE(a1o.allocated() == 0);
REQUIRE(a1o.committed() == 0);
}
}
TEST_CASE("allocator-alloc-1", "[alloc2][AAllocator]")
@ -152,6 +167,8 @@ namespace xo {
DArena arena = DArena::map(cfg);
auto a1o = with_facet<AAllocator>::mkobj(&arena);
REQUIRE(!a1o._has_null_vptr());
REQUIRE(a1o.reserved() >= cfg.size_);
REQUIRE(a1o.committed() == 0);
REQUIRE(a1o.available() == 0);
@ -180,6 +197,12 @@ namespace xo {
REQUIRE(a1o.allocated() <= a1o.committed());
REQUIRE(a1o.allocated() + a1o.available() == a1o.committed());
REQUIRE(a1o.committed() <= a1o.reserved());
a1o._drop();
{
REQUIRE(a1o.allocated() == 0);
REQUIRE(a1o.committed() == 0);
}
}
TEST_CASE("allocator-alloc-2", "[alloc2][Allocator]")
@ -202,6 +225,8 @@ namespace xo {
//obj<AAllocator, DArena> a1o{&arena};
auto a1o = with_facet<AAllocator>::mkobj(&arena);
REQUIRE(!a1o._has_null_vptr());
REQUIRE(a1o.reserved() >= cfg.size_);
REQUIRE(a1o.committed() == 0);
REQUIRE(a1o.available() == 0);
@ -244,7 +269,7 @@ namespace xo {
}
a1o.clear();
{
// allocated size got reset
REQUIRE(a1o.allocated() == 0);
// committed size unchanged
@ -259,6 +284,13 @@ namespace xo {
REQUIRE(a1o.contains(m0));
}
a1o._drop();
{
REQUIRE(a1o.allocated() == 0);
REQUIRE(a1o.committed() == 0);
}
}
TEST_CASE("allocator-alloc-3", "[alloc2][Allocator]")
{
using header_type = AllocHeader;
@ -279,6 +311,8 @@ namespace xo {
//obj<AAllocator, DArena> a1o{&arena};
auto a1o = with_facet<AAllocator>::mkobj(&arena);
REQUIRE(!a1o._has_null_vptr());
REQUIRE(a1o.reserved() >= cfg.size_);
REQUIRE(a1o.committed() == 0);
REQUIRE(a1o.available() == 0);
@ -301,7 +335,7 @@ namespace xo {
header_type* header = (header_type*)(m0 - sizeof(header_type));
size_t pad = padding::with_padding(z0) - z0;
byte * guard1 = m0 + z0 + pad;
{
REQUIRE(a1o.contains(guard0));
REQUIRE(a1o.contains(header));
REQUIRE(cfg.header_.size(*header) == padding::with_padding(z0));
@ -320,6 +354,13 @@ namespace xo {
REQUIRE(a1o.committed() <= a1o.reserved());
}
a1o._drop();
{
REQUIRE(a1o.allocated() == 0);
REQUIRE(a1o.committed() == 0);
}
}
TEST_CASE("allocator-fail-1", "[alloc2][AAllocator]")
{
/* typed allocator a1o */
@ -332,6 +373,8 @@ namespace xo {
REQUIRE(cfg.size_ <= cfg.hugepage_z_);
REQUIRE(!a1o._has_null_vptr());
REQUIRE(a1o.reserved() >= cfg.size_);
REQUIRE(a1o.committed() == 0);
REQUIRE(a1o.available() == 0);
@ -339,11 +382,9 @@ namespace xo {
size_t z0 = cfg.hugepage_z_ + 1;
byte * m0 = a1o.alloc(typeseq::sentinel(), z0);
REQUIRE(!m0);
AllocError err = a1o.last_error();
{
REQUIRE(!m0);
REQUIRE(err.error_ == error::reserve_exhausted);
REQUIRE(err.error_seq_ == 1);
REQUIRE(err.request_z_ >= z0);
@ -351,6 +392,13 @@ namespace xo {
REQUIRE(err.committed_z_ == 0);
REQUIRE(err.reserved_z_ == arena.reserved());
}
a1o._drop();
{
REQUIRE(a1o.allocated() == 0);
REQUIRE(a1o.committed() == 0);
}
}
} /*namespace ut*/
} /*namespace xo*/

2
xo-gc/include/xo/gc/detail/IAllocator_DX1Collector.hpp
View file

@ -80,8 +80,10 @@ namespace xo {
void ** lhs_data,
AGCObject * rhs_iface,
void * rhs_data);
#ifdef OBSOLETE
/** invoke destructor **/
static void destruct_data(DX1Collector & d);
#endif
};
} /*namespace mm*/

2
xo-gc/src/gc/IAllocator_DX1Collector.cpp
View file

@ -144,11 +144,13 @@ namespace xo {
d.barrier_assign_aux(parent, lhs_iface, lhs_data, rhs_iface, rhs_data);
}
#ifdef OBSOLETE
void
IAllocator_DX1Collector::destruct_data(DX1Collector & d)
{
d.~DX1Collector();
}
#endif
} /*namespace mm*/
} /*namespace xo*/

1
xo-gc/utest/CMakeLists.txt
View file

@ -14,6 +14,7 @@ set(UTEST_SRCS
DMockCollector.cpp
ICollector_DMockCollector.cpp
MockCollector.test.cpp
MlsTestutil.cpp
GcosTestutil.cpp

22
xo-gc/utest/Collector.test.cpp
View file

@ -58,6 +58,7 @@ namespace xo {
/* empty variant collector */
obj<ACollector> gc1;
REQUIRE(!gc1._has_null_vptr());
REQUIRE(!gc1);
REQUIRE(gc1.iface() != nullptr);
REQUIRE(gc1.data() == nullptr);
@ -150,6 +151,12 @@ namespace xo {
/* typed collector -- repr known at compile time */
obj<ACollector, DX1Collector> x1(&gc);
REQUIRE(!x1._has_null_vptr());
REQUIRE(x1.iface());
REQUIRE(x1.data());
x1._drop();
REQUIRE(x1.iface());
REQUIRE(x1.data());
}
@ -182,6 +189,11 @@ namespace xo {
REQUIRE(x1.iface());
REQUIRE(x1.data());
x1._drop();
REQUIRE(x1.iface());
REQUIRE(x1.data());
}
TEST_CASE("collector-x1-alloc", "[alloc2][gc]")
@ -238,6 +250,11 @@ namespace xo {
bool catch_flag = false;
REQUIRE(utest::AllocUtil::random_allocs(c_n_alloc, c_max_alloc_payload,
catch_flag, &rng, x1alloc));
x1gc._drop();
REQUIRE(x1gc.iface());
REQUIRE(x1gc.data());
}
TEST_CASE("collector-x1-alloc2", "[alloc2][gc]")
@ -298,6 +315,11 @@ namespace xo {
// just testing ability to work as a low-level allocator
REQUIRE(utest::AllocUtil::random_allocs(c_n_alloc, c_max_alloc_payload,
c_debug_flag, &rng, x1alloc));
x1gc._drop();
REQUIRE(x1gc.iface());
REQUIRE(x1gc.data());
}
namespace {

119
xo-gc/utest/MockCollector.test.cpp Normal file
View file

@ -0,0 +1,119 @@
/** @file MockCollector.test.cpp
*
* @author Roland Conybeare, May 2026
**/
#include "MockCollector.hpp"
#include <xo/gc/X1VerifyStats.hpp>
#include <xo/object2/Integer.hpp>
#include <xo/alloc2/Collector.hpp>
#include <xo/alloc2/Arena.hpp>
#include <catch2/catch.hpp>
namespace ut {
using xo::scm::DInteger;
using xo::mm::ACollector;
using xo::mm::DMockCollector;
using xo::mm::MutationLogConfig;
using xo::mm::MutationLogStore;
using xo::mm::GCObjectStoreConfig;
using xo::mm::GCObjectStore;
using xo::mm::AGCObject;
using xo::mm::Generation;
using xo::mm::Role;
using xo::mm::X1VerifyStats;
using xo::mm::AAllocator;
using xo::mm::ArenaConfig;
using xo::mm::DArena;
using xo::facet::obj;
// Gilding the lily here.
// The only reason to 'test' MockCollector is to suppress
// false positives on coverage reports.
// Don't care about MockCollector itself, but it also shows up
// in ICollector_Xfer, at least on the osx/clang toolchain
TEST_CASE("MockCollector-1", "[MockCollector]")
{
// need to create a {gcos, mls} pair
constexpr uint32_t c_space_z = 64*1024;
constexpr uint32_t c_n_gen = 1;
constexpr uint32_t c_n_survive = 0;
X1VerifyStats verify_stats;
GCObjectStoreConfig gcos_config{ArenaConfig()
.with_name("gcos-arena-name-notused")
.with_size(c_space_z)
.with_store_header_flag(true),
c_n_gen,
c_n_survive,
64*1024 /*object_type_z*/,
false /*debug_flag*/};
DArena report_arena{ArenaConfig().with_name("report-arena")
.with_size(64*1024)
.with_store_header_flag(true)};
DArena error_arena{ArenaConfig().with_name("error-arena")
.with_size(64*1024)
.with_store_header_flag(true)};
MutationLogConfig mls_config{c_n_gen,
1024 /*mlog_z*/,
false /*mlog_enabled_flag*/,
false /*debug_flag*/};
GCObjectStore gcos{gcos_config, &verify_stats};
MutationLogStore mls{mls_config, &gcos};
DMockCollector mock(&mls, &gcos);
auto mockgc = obj<ACollector,DMockCollector>(&mock);
auto report_mm = obj<AAllocator,DArena>(&report_arena);
auto error_mm = obj<AAllocator,DArena>(&error_arena);
REQUIRE(mockgc.reserved(Generation::g0(), Role::to_space()) == c_space_z);
{
int dummy;
REQUIRE(mockgc.locate_address(&dummy) == -1);
REQUIRE(mockgc.contains(Role::to_space(), &dummy) == false);
}
{
obj<AGCObject> rpt;
{
// stub
REQUIRE(mockgc.report_statistics(report_mm, error_mm, &rpt) == false);
REQUIRE(report_mm.allocated() == 0);
}
{
mockgc.report_object_types(report_mm, error_mm, &rpt);
REQUIRE(rpt);
rpt.reset();
report_mm.clear();
}
{
mockgc.report_object_ages(report_mm, error_mm, &rpt);
REQUIRE(rpt);
rpt.reset();
report_mm.clear();
}
}
{
auto g0_from = gcos.from_space(Generation::g0());
REQUIRE(g0_from);
auto g0_from_mm = obj<AAllocator,DArena>(g0_from);
// note: we don't need object types in gcos for this test,
// since we're not traversing the object graph
auto x = DInteger::box(g0_from_mm, 42);
REQUIRE(x);
auto x_copy = mockgc.alloc_copy((std::byte*)x.data());
REQUIRE(x_copy);
}
}
} /*namespace ut*/
/* end MockCollector.test.cpp */

12
xo-gc/utest/X1Collector.test.cpp
View file

@ -119,7 +119,8 @@ namespace ut {
DX1Collector gc(cfg);
CollectorTypeRegistry::instance().install_types(obj<ACollector,DX1Collector>(&gc));
CollectorTypeRegistry::instance()
.install_types(obj<ACollector,DX1Collector>(&gc));
DArena * to_0 = nullptr;
@ -219,6 +220,9 @@ namespace ut {
+ sizeof(AllocHeader) + sizeof(DInteger)
+ sizeof(AllocHeader) + sizeof(DList)));
auto to0_commit_z = to_0->committed();
auto to0_reserved_z = to_0->reserved();
{
{
REQUIRE(x0_o.iface() != nullptr);
@ -285,6 +289,12 @@ namespace ut {
REQUIRE((void*)l0_o.data()->head_.data() == (void*)x0_o.data());
REQUIRE((void*)l0_o.data()->rest_ == (void*)DList::_nil());
Generation g0 = Generation::g0();
REQUIRE(c_o.committed(g0, Role::to_space()) == to0_commit_z);
REQUIRE(c_o.reserved(g0, Role::to_space()) == to0_reserved_z);
REQUIRE(c_o.locate_address(x0_o.data()) >= 0);
REQUIRE(c_o.contains(Role::to_space(), x0_o.data()));
} catch (std::exception & ex) {
std::cerr << "caught exception: " << ex.what() << std::endl;
REQUIRE(false);