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

xo-object2: obj<ACollector> argument to DArray::push_back()

Browse source
This commit is contained in:
Roland Conybeare 2026-04-28 23:17:00 -04:00
commit d24f851eb5
5 changed files with 114 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/object2/DArray.cpp
View file

@ -4,6 +4,7 @@
**/
#include "DArray.hpp"
#include "gc/RCollector_aux.hpp"
#include <xo/printable2/Printable.hpp>
#include <xo/facet/FacetRegistry.hpp>
#include <xo/indentlog/print/pretty.hpp>
@ -15,13 +16,14 @@ namespace xo {
using xo::print::APrintable;
using xo::facet::FacetRegistry;
using xo::mm::AGCObject;
using xo::mm::mm_do_assign;
using xo::facet::typeseq;
namespace scm {
// TODO: error reporting?
DArray *
DArray::empty(obj<AAllocator> mm,
size_type cap)
DArray::_empty(obj<AAllocator> mm,
size_type cap)
{
DArray * result = nullptr;
@ -45,7 +47,7 @@ namespace xo {
DArray * src,
size_type new_cap)
{
DArray * dest = empty(mm, new_cap);
DArray * dest = _empty(mm, new_cap);
if (dest) [[likely]] {
/** could just memcpy here **/
@ -73,20 +75,20 @@ namespace xo {
}
bool
DArray::assign_at(size_type ix, obj<AGCObject> x) noexcept
DArray::assign_at(obj<ACollector> gc, size_type ix, obj<AGCObject> x) noexcept
{
if (ix >= size_)
return false;
scope log(XO_DEBUG(true), "need write barrier");
this->elts_[ix] = x;
mm_do_assign(gc, this, &elts_[ix], x);
return true;
}
bool
DArray::push_back(obj<AGCObject> elt) noexcept
DArray::push_back(obj<ACollector> gc, obj<AGCObject> elt) noexcept
{
if (size_ >= capacity_) {
return false;
@ -94,8 +96,9 @@ namespace xo {
static_assert(!std::is_trivially_constructible_v<obj<AGCObject>>);
void * mem = &(elts_[size_]);
new (mem) obj<AGCObject>();
new (mem) obj<AGCObject>(elt);
mm_do_assign(gc, this, &(elts_[size_]), elt);
++(this->size_);

38
src/object2/DDictionary.cpp
View file

@ -30,8 +30,8 @@ namespace xo {
if (cap <= 0)
cap = 1;
DArray * keys = DArray::empty(mm, cap);
DArray * values = DArray::empty(mm, cap);
DArray * keys = DArray::_empty(mm, cap);
DArray * values = DArray::_empty(mm, cap);
if (keys && values)
return new (mem) DDictionary(keys, values);
@ -108,7 +108,7 @@ namespace xo {
}
bool
DDictionary::try_update(const pair_type & kv_pair)
DDictionary::try_update(obj<ACollector> gc, const pair_type & kv_pair)
{
for (size_type i = 0, n = keys_->size(); i < n; ++i) {
auto key_i = obj<AGCObject,DString>::from((*keys_)[i]);
@ -116,7 +116,7 @@ namespace xo {
assert(key_i);
if (*(key_i.data()) == *(kv_pair.first)) {
values_->assign_at(i, kv_pair.second);
values_->assign_at(gc, i, kv_pair.second);
return true;
}
}
@ -125,7 +125,7 @@ namespace xo {
}
bool
DDictionary::try_update_cstr(const char * key, obj<AGCObject> value)
DDictionary::try_update_cstr(obj<ACollector> gc, const char * key, obj<AGCObject> value)
{
for (size_type i = 0, n = keys_->size(); i < n; ++i) {
auto key_i = obj<AGCObject,DString>::from((*keys_)[i]);
@ -133,7 +133,7 @@ namespace xo {
assert(key_i);
if (strcmp(key, key_i->data()) == 0) {
values_->assign_at(i, value);
values_->assign_at(gc, i, value);
return true;
}
@ -147,8 +147,10 @@ namespace xo {
{
const DString * k1 = DString::from_cstr(mm, key_cstr);
if (k1)
return this->try_upsert(std::make_pair(k1, value));
if (k1) {
obj<ACollector> gc = mm.try_to_facet<ACollector>();
return this->try_upsert(gc, std::make_pair(k1, value));
}
return false;
}
@ -165,21 +167,23 @@ namespace xo {
}
bool
DDictionary::try_upsert(const pair_type & kv_pair)
DDictionary::try_upsert(obj<ACollector> gc, const pair_type & kv_pair)
{
if (this->try_update(kv_pair))
if (this->try_update(gc, kv_pair))
return true;
if (keys_->size() == keys_->capacity())
return false;
return this->_append_kv_aux(kv_pair);
return this->_append_kv_aux(gc, kv_pair);
}
bool
DDictionary::upsert(obj<AAllocator> mm, const pair_type & kv_pair)
{
if (this->try_update(kv_pair))
obj<ACollector> gc = mm.try_to_facet<ACollector>();
if (this->try_update(gc, kv_pair))
return true;
// key not present -> must expand {key array, value array}
@ -200,17 +204,19 @@ namespace xo {
}
}
return this->_append_kv_aux(kv_pair);
return this->_append_kv_aux(gc, kv_pair);
}
bool
DDictionary::_append_kv_aux(const pair_type & kv_pair)
DDictionary::_append_kv_aux(obj<ACollector> gc, const pair_type & kv_pair)
{
DString * key = const_cast<DString *>(kv_pair.first);
bool ok
= keys_->push_back(obj<AGCObject,DString>(const_cast<DString *>(kv_pair.first)));
= keys_->push_back(gc, obj<AGCObject,DString>(key));
if (ok) {
ok = values_->push_back(kv_pair.second);
ok = values_->push_back(gc, kv_pair.second);
if (!ok) {
// since we couldn't insert value, also drop key