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

xo-arena: bookends around control array (prep iterator support)

Browse source
This commit is contained in:
Roland Conybeare 2026-01-08 13:55:19 -05:00
commit 8e4f4e8a87
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/xo/arena/DArenaHashMap.hpp
View file

@ -80,7 +80,7 @@ namespace xo {
/** Iterator sentinel at begin/end of control array. /** Iterator sentinel at begin/end of control array.
* Load-bearing for bidirectional iterator implementation * Load-bearing for bidirectional iterator implementation
**/ **/
static constexpr size_type c_control_stub = 0; //c_group_size; static constexpr size_type c_control_stub = c_group_size; //c_group_size;
/** control: true for sentinel values **/ /** control: true for sentinel values **/
static constexpr bool is_sentinel(control_type ctrl) { static constexpr bool is_sentinel(control_type ctrl) {
@ -194,7 +194,7 @@ namespace xo {
n_group_exponent_{group_exp2.first}, n_group_exponent_{group_exp2.first},
n_group_{group_exp2.second}, n_group_{group_exp2.second},
n_slot_{group_exp2.second * c_group_size}, n_slot_{group_exp2.second * c_group_size},
control_{DArenaVector<uint8_t>::map(ArenaConfig{.size_ = n_slot_ + c_group_size})}, control_{DArenaVector<uint8_t>::map(ArenaConfig{.size_ = control_size(n_slot_)})},
slots_{DArenaVector<value_type>::map(ArenaConfig{.size_ = n_slot_ * sizeof(value_type)})} slots_{DArenaVector<value_type>::map(ArenaConfig{.size_ = n_slot_ * sizeof(value_type)})}
{ {
/* here: arenas have allocated address range, but no committed memory yet */ /* here: arenas have allocated address range, but no committed memory yet */
@ -235,7 +235,7 @@ namespace xo {
public: public:
void _init() { void _init() {
this->control_.resize(n_slot_ + c_group_size); this->control_.resize(control_size(n_slot_));
/* all slots marked empty initially */ /* all slots marked empty initially */
std::fill(this->control_.begin(), std::fill(this->control_.begin(),
@ -790,12 +790,12 @@ namespace xo {
/* SM3.1: control_[N+i] = control_[i] for i in [0, c_group_size) */ /* SM3.1: control_[N+i] = control_[i] for i in [0, c_group_size) */
for (size_type i = 0; i < c_group_size; ++i) { for (size_type i = 0; i < c_group_size; ++i) {
if (store_.control_[store_.n_slot_ + i + c_control_stub] != store_.control_[i] + c_control_stub) { if (store_.control_[store_.n_slot_ + i + c_control_stub] != store_.control_[i + c_control_stub]) {
return policy.report_error(log, return policy.report_error(log,
c_self, ": expect control_[N+i] = control_[i]", c_self, ": expect control_[N+i] = control_[i]",
xtag("i", i), xtag("i", i),
xtag("control_[i]", store_.control_[i]), xtag("control_[i]", (int)(store_.control_[i + c_control_stub])),
xtag("control_[N+i]", store_.control_[store_.n_slot_ + i])); xtag("control_[N+i]", (int)(store_.control_[store_.n_slot_ + i + c_control_stub])));
} }
} }