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

xo-gc: refactor: move _shallow_move() to GCObjectStore

Browse source
This commit is contained in:
Roland Conybeare 2026-04-03 15:37:15 -04:00
commit 1f0aa5f6a6
4 changed files with 57 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/xo/gc/DX1Collector.hpp
View file

@ -280,7 +280,7 @@ namespace xo {
/** evacuate object with type @p iface at address @p from_src
* to to-space. Return new to-space location.
**/
void * shallow_move(const AGCObject * iface, void * from_src);
void * _shallow_move(const AGCObject * iface, void * from_src);
/** true iff {alloc_hdr, object_data} should move for
* currently-running collection.

8
include/xo/gc/GCObjectStore.hpp
View file

@ -108,6 +108,14 @@ namespace xo {
**/
bool install_type(const AGCObject & meta) noexcept;
/** during a gc cycle:
* evacuate object @p from_src, with gc-object interface @p iface.
* Shallow: does not traverse children
**/
void * _shallow_move(obj<AAllocator> mm,
const AGCObject * iface,
void * from_src);
/** traverse objects allocated after @p ckp, to make sure their children
* are forwarded. Repeat until traverse doesn't find any unforwarded children.
*

41
src/gc/DX1Collector.cpp
View file

@ -868,7 +868,7 @@ namespace xo {
void *
DX1Collector::deep_move_interior(void * from_src,
Generation upto)
Generation upto)
{
scope log(XO_DEBUG(config_.debug_flag_));
@ -935,7 +935,7 @@ namespace xo {
assert(iface->_has_null_vptr() == false);
void * to_dest = this->shallow_move(iface, from_src);
void * to_dest = this->_shallow_move(iface, from_src);
this->_forward_children_until_fixpoint(upto, gray_lo_v);
@ -1261,7 +1261,7 @@ namespace xo {
* +----------+
*/
*lhs_data = this->shallow_move(lhs_iface, *lhs_data);
*lhs_data = this->_shallow_move(lhs_iface, *lhs_data);
/*
* lhs obj<AGCObject> (from-space)
@ -1321,42 +1321,11 @@ namespace xo {
}
void *
DX1Collector::shallow_move(const AGCObject * iface, void * from_src)
DX1Collector::_shallow_move(const AGCObject * iface, void * from_src)
{
scope log(XO_DEBUG(config_.debug_flag_));
AllocInfo info = this->alloc_info((std::byte *)from_src);
obj<AAllocator, DX1Collector> alloc(this);
void * to_dest = iface->shallow_copy(from_src, alloc);
log && log(xtag("from_src", from_src), xtag("to_dest", to_dest));
log && log(xtag("tseq", info.tseq()),
xtag("tname", TypeRegistry::id2name(typeseq(info.tseq()))),
xtag("age", info.age()), xtag("size", info.size()));
if (config_.sanitize_flag_) {
AllocInfo info_copy = this->alloc_info((std::byte *)to_dest);
log && log(xtag("age2", info_copy.age()), xtag("size2", info_copy.size()));
assert((info_copy.age() == config_.arena_config_.header_.max_age())
|| (info_copy.age() == info.age() + 1));
}
if(to_dest == from_src) {
assert(false);
} else {
*(const_cast<AllocHeader*>(info.p_header_))
= AllocHeader(config_
.arena_config_
.header_
.mark_forwarding_tseq(*info.p_header_));
*(void **)from_src = to_dest;
}
return to_dest;
return gco_store_._shallow_move(alloc, iface, from_src);
}
bool

43
src/gc/GCObjectStore.cpp
View file

@ -438,6 +438,49 @@ namespace xo {
return true;
}
void *
GCObjectStore::_shallow_move(obj<AAllocator> mm,
const AGCObject * iface,
void * from_src)
{
scope log(XO_DEBUG(config_.debug_flag_));
AllocInfo info = this->alloc_info((std::byte *)from_src);
//obj<AAllocator, DX1Collector> gc_gco(gc);
void * to_dest = iface->shallow_copy(from_src, mm);
log && log(xtag("from_src", from_src), xtag("to_dest", to_dest));
log && log(xtag("tseq", info.tseq()),
xtag("tname", TypeRegistry::id2name(typeseq(info.tseq()))),
xtag("age", info.age()),
xtag("size", info.size()));
if (config_.debug_flag_) {
AllocInfo info_copy = this->alloc_info((std::byte *)to_dest);
log && log(xtag("age2", info_copy.age()), xtag("size2", info_copy.size()));
assert((info_copy.age() == config_.arena_config_.header_.max_age())
|| (info_copy.age() == info.age() + 1));
}
if(to_dest == from_src) {
assert(false);
} else {
*(const_cast<AllocHeader*>(info.p_header_))
= AllocHeader(config_
.arena_config_
.header_
.mark_forwarding_tseq(*info.p_header_));
*(void **)from_src = to_dest;
}
return to_dest;
} /*shallow_move*/
#ifdef MARKED
void
GCObjectStore::_forward_children_until_fixpoint(DX1Collector * gc,