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

refactor focusing on xo-alloc2/ xo-gc/ write-barrier

Browse source 
ability to inform allocator of gco->gco mutation, via AAllocator i/face.
This commit is contained in:
Roland Conybeare 2026-05-01 19:54:26 -04:00
commit 024574350a
9 changed files with 75 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/xo/object2/DArray.hpp
View file

@ -6,7 +6,6 @@
#pragma once
#include <xo/alloc2/GCObject.hpp>
//#include <xo/alloc2/Collector.hpp>
#include <xo/alloc2/Allocator.hpp>
#include <xo/facet/obj.hpp>
#include <xo/indentlog/print/ppindentinfo.hpp>
@ -20,7 +19,7 @@ namespace xo {
namespace detail {
/** null base case **/
static inline bool do_array_push_back(DArray *,
obj<xo::mm::ACollector>)
obj<xo::mm::AAllocator>)
{
return true;
}
@ -28,7 +27,7 @@ namespace xo {
template <typename A, typename... Rest>
requires (std::convertible_to<A, obj<xo::mm::AGCObject>>)
static bool do_array_push_back(DArray * lhs,
obj<xo::mm::ACollector> gc,
obj<xo::mm::AAllocator> mm,
A arg1,
Rest... rest);
}
@ -49,7 +48,7 @@ namespace xo {
/** type for array size **/
using size_type = std::uint32_t;
using AAllocator = xo::mm::AAllocator;
using ACollector = xo::mm::ACollector;
//using ACollector = xo::mm::ACollector;
using AGCObject = xo::mm::AGCObject;
/** gc-centric object visitor **/
using AGCObjectVisitor = xo::mm::AGCObjectVisitor;
@ -114,8 +113,6 @@ namespace xo {
obj<AGCObject> at(size_type index) const;
const obj<AGCObject> & operator[](size_type index) const noexcept { return elts_[index]; }
// TODO: nuke this or provide LValue shim. need write barrier!
obj<AGCObject> & operator[](size_type index) noexcept { return elts_[index]; }
///@}
/** @defgroup darray-iterators iterators **/
@ -128,17 +125,17 @@ namespace xo {
/** store @p elt at position @p index.
* true on success, false otherwise
**/
bool assign_at(obj<ACollector> gc, size_type index, obj<AGCObject> elt) noexcept;
bool assign_at(obj<AAllocator> mm, size_type index, obj<AGCObject> elt) noexcept;
/** append @p elt at the end of array.
* true on success, false otherwise.
* on failure array is unaltered
**/
bool push_back(obj<ACollector> gc, obj<AGCObject> elt) noexcept;
bool push_back(obj<AAllocator> mm, obj<AGCObject> elt) noexcept;
template <typename... Args>
requires (std::convertible_to<Args, obj<AGCObject>> && ...)
bool push_back_all(obj<ACollector> gc, Args... args) noexcept;
bool push_back_all(obj<AAllocator> mm, Args... args) noexcept;
/** store last element in array into @p elt and decrement array size.
* true on success; false on failure (implies array was empty)
@ -206,10 +203,10 @@ namespace xo {
DArray *
DArray::array(obj<AAllocator> mm, Args... args)
{
obj<ACollector> gc = mm.try_to_facet<ACollector>();
//obj<ACollector> gc = mm.try_to_facet<ACollector>();
DArray * result = _empty(mm, sizeof...(args));
if (result) {
detail::do_array_push_back(result, gc, args...);
detail::do_array_push_back(result, mm, args...);
}
return result;
}
@ -218,20 +215,20 @@ namespace xo {
template <typename A, typename... Rest>
requires (std::convertible_to<A, obj<xo::mm::AGCObject>>)
static bool do_array_push_back(DArray * lhs,
obj<xo::mm::ACollector> gc,
obj<xo::mm::AAllocator> mm,
A arg1,
Rest... rest)
{
return (lhs->push_back(gc, arg1)
&& do_array_push_back(lhs, gc, rest...));
return (lhs->push_back(mm, arg1)
&& do_array_push_back(lhs, mm, rest...));
}
}
template <typename... Args>
requires (std::convertible_to<Args, obj<xo::mm::AGCObject>> && ...)
bool
DArray::push_back_all(obj<ACollector> gc, Args... args) noexcept {
return detail::do_array_push_back(this, gc, args...);
DArray::push_back_all(obj<AAllocator> mm, Args... args) noexcept {
return detail::do_array_push_back(this, mm, args...);
}
} /*namespace scm*/

2
include/xo/object2/DBoolean.hpp
View file

@ -5,7 +5,6 @@
#pragma once
//#include <xo/alloc2/Collector.hpp>
#include <xo/alloc2/Allocator.hpp>
#include <xo/alloc2/GCObjectVisitor.hpp>
#include <xo/indentlog/print/ppindentinfo.hpp>
@ -16,7 +15,6 @@ namespace xo {
namespace scm {
struct DBoolean {
using AAllocator = xo::mm::AAllocator;
//using ACollector = xo::mm::ACollector;
using AGCObjectVisitor = xo::mm::AGCObjectVisitor;
using AGCObject = xo::mm::AGCObject;
using VisitReason = xo::mm::VisitReason;

11
include/xo/object2/DDictionary.hpp
View file

@ -9,7 +9,6 @@
#include "DString.hpp"
#include <xo/alloc2/GCObject.hpp>
#include <xo/alloc2/GCObjectVisitor.hpp>
#include <xo/alloc2/Collector.hpp>
#include <xo/alloc2/Allocator.hpp>
#include <xo/facet/obj.hpp>
#include <xo/indentlog/print/ppindentinfo.hpp>
@ -34,8 +33,6 @@ namespace xo {
using size_type = std::uint32_t;
/** xo allocator facet **/
using AAllocator = xo::mm::AAllocator;
/** garbage collector facet **/
using ACollector = xo::mm::ACollector;
/** gc-centric object visitor **/
using AGCObjectVisitor = xo::mm::AGCObjectVisitor;
/** gc-aware object facet **/
@ -144,12 +141,12 @@ namespace xo {
*
* @return true if key-value pair updated; false if key not found
**/
bool try_update(obj<ACollector> gc, const pair_type & kvpair);
bool try_update(obj<AAllocator> mm, const pair_type & kvpair);
/** update key-value pair for existing @p key to map to @p value.
* false if @p key not already present.
**/
bool try_update_cstr(obj<ACollector> gc, const char * key, obj<AGCObject> value);
bool try_update_cstr(obj<AAllocator> gc, const char * key, obj<AGCObject> value);
/** convenience method:
* try_upsert pair (k, @p value), after boxing c-style string @p key with @p mm to get k
@ -167,7 +164,7 @@ namespace xo {
*
* False if dictionary already at capacity
**/
bool try_upsert(obj<ACollector> gc, const pair_type & kvpair);
bool try_upsert(obj<AAllocator> gc, const pair_type & kvpair);
/** upsert key-value pair @p kvpair into dictionary.
* If at capacity, expand capacity, getting new memory from @p mm.
@ -217,7 +214,7 @@ namespace xo {
/** append {key, value} pair @p kv_pair to this dictionary
* Require: @p kv_pair.first not already present in @ref keys_
**/
bool _append_kv_aux(obj<ACollector> gc, const pair_type & kv_pair);
bool _append_kv_aux(obj<AAllocator> mm, const pair_type & kv_pair);
///@}
private:

2
include/xo/object2/DInteger.hpp
View file

@ -5,7 +5,6 @@
#pragma once
//#include <xo/alloc2/Collector.hpp>
#include <xo/alloc2/GCObjectVisitor.hpp>
#include <xo/alloc2/Allocator.hpp>
#include <xo/indentlog/print/ppindentinfo.hpp>
@ -16,7 +15,6 @@ namespace xo {
namespace scm {
struct DInteger {
using AAllocator = xo::mm::AAllocator;
//using ACollector = xo::mm::ACollector;
using AGCObjectVisitor = xo::mm::AGCObjectVisitor;
using AGCObject = xo::mm::AGCObject;
using VisitReason = xo::mm::VisitReason;

3
include/xo/object2/DList.hpp
View file

@ -64,7 +64,8 @@ namespace xo {
obj<AGCObject> at(size_type ix) const;
/** assign head **/
void assign_head(obj<ACollector> gc, obj<AGCObject> h);
void assign_head(obj<AAllocator> mm, obj<AGCObject> h);
void assign_head_gc(obj<ACollector> gc, obj<AGCObject> h);
/** assign rest-pointer. Caller responsible for preserving acyclic property! **/
void _assign_rest(DList * r);