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

xo-gc xo-object2: gc bugfixes and logging [WORKING]

Browse source
This commit is contained in:
Roland Conybeare 2026-01-04 15:33:08 -05:00
commit 103ffb8a17
3 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/object2/DList.cpp
View file

@ -41,7 +41,7 @@ namespace xo {
bool
DList::is_empty() const noexcept
{
return this != &s_null;
return this == &s_null;
}
auto

3
src/object2/IGCObject_DList.cpp
View file

@ -4,6 +4,7 @@
**/
#include "IGCObject_DList.hpp"
#include <xo/indentlog/scope.hpp>
namespace xo {
using xo::mm::AGCObject;
@ -36,6 +37,8 @@ namespace xo {
IGCObject_DList::forward_children(DList & src,
obj<ACollector> gc) noexcept
{
scope log(XO_DEBUG(true));
gc.forward_inplace(src.head_.iface(), (void **)&(src.head_.data_));
auto iface = xo::facet::impl_for<AGCObject, DList>();

26
utest/X1Collector.test.cpp
View file

@ -19,6 +19,9 @@
#include <xo/alloc2/AllocInfo.hpp>
#include <xo/alloc2/padding.hpp>
#include <xo/indentlog/scope.hpp>
#include <xo/indentlog/print/tag.hpp>
#include <catch2/catch.hpp>
namespace ut {
@ -39,6 +42,8 @@ namespace ut {
using xo::mm::padding;
using xo::facet::with_facet;
using xo::facet::typeseq;
using xo::scope;
using xo::xtag;
namespace {
struct testcase_x1 {
@ -69,6 +74,9 @@ namespace ut {
TEST_CASE("x1", "[gc][x1]")
{
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));
for (std::size_t i_tc = 0, n_tc = s_testcase_v.size(); i_tc < n_tc; ++i_tc) {
try {
const testcase_x1 & tc = s_testcase_v[i_tc];
@ -82,6 +90,7 @@ namespace ut {
.gc_trigger_v_{{
tc.incr_gc_threshold_,
tc.full_gc_threshold_}},
.debug_flag_ = c_debug_flag,
};
DX1Collector gc(cfg);
@ -140,6 +149,8 @@ namespace ut {
REQUIRE(gc.reserved_total()
== otypes->reserved() + roots->reserved() + 4 * from_0->reserved());
log && log(xtag("from_0", from_0->lo_), xtag("to_0", to_0->lo_));
}
/* attempt allocation */
@ -197,11 +208,22 @@ namespace ut {
}
}
/* no GC roots, so GC is trivial */
c_o.request_gc(generation{1});
log && log(xtag("l0_o.data()", l0_o.data()));
log && log(xtag("l0_o.data()->head_.data()", l0_o.data()->head_.data()));
log && log(xtag("x0_o.data()", x0_o.data()));
REQUIRE(!gc.contains(role::from_space(), x0_o.data()));
REQUIRE(gc.contains(role::to_space(), x0_o.data()));
REQUIRE(x0_o.data()->value() == 3.1415927);
REQUIRE(!gc.contains(role::from_space(), l0_o.data()));
REQUIRE(gc.contains(role::to_space(), l0_o.data()));
REQUIRE(l0_o.data()->is_empty() == false);
REQUIRE((void*)l0_o.data()->head_.data() == (void*)x0_o.data());
} catch (std::exception & ex) {
std::cerr << "caught exception: " << ex.what() << std::endl;
REQUIRE(false);