weaselab/versioned-map
2
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Handle decrementing end

Browse Source
This commit is contained in:
Andrew Noyes
2024-05-15 14:50:55 -07:00
parent 2b22a7823a
commit 464d720a6b
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
VersionedMap.cpp
View File

@@ -1015,6 +1015,8 @@ void materializeMutations(VersionedMap::Iterator::Impl *impl, const Entry *prev,
}
VersionedMap::Iterator &VersionedMap::Iterator::operator++() {
impl->cmp = 1;
if (impl->mutationIndex < impl->mutationCount - 1) {
++impl->mutationIndex;
return *this;
@@ -1040,19 +1042,46 @@ VersionedMap::Iterator VersionedMap::Iterator::operator++(int) {
}
VersionedMap::Iterator &VersionedMap::Iterator::operator--() {
impl->cmp = -1;
if (impl->mutationIndex > 0) {
--impl->mutationIndex;
return *this;
}
// TODO support decrementing end
// Handle decrementing end
if (impl->finger.searchPathSize() == 0) {
bool ignored;
impl->finger.push(
impl->map->roots.getThreadSafeHandle().rootForVersion(impl->version),
ignored);
assert(impl->finger.backNode() != 0);
uint32_t c;
while ((c = impl->map->child<std::memory_order_acquire>(
impl->finger.backNode(), true, impl->version)) != 0) {
impl->finger.push(c, true);
}
const Entry *next = nullptr;
for (;;) {
materializeMutations(impl, nullptr, next);
if (impl->mutationCount > 0) {
break;
}
next = impl->map->mm.base[impl->finger.backNode()].entry;
impl->map->move<std::memory_order_acquire>(impl->finger, impl->version,
false);
}
impl->mutationIndex = impl->mutationCount - 1;
return *this;
}
do {
const auto &entry = *impl->map->mm.base[impl->finger.backNode()].entry;
const Entry *entry = impl->map->mm.base[impl->finger.backNode()].entry;
impl->map->move<std::memory_order_acquire>(impl->finger, impl->version,
false);
if (impl->finger.searchPathSize() > 0) {
materializeMutations(impl, nullptr, &entry);
materializeMutations(impl, nullptr, entry);
}
} while (impl->mutationCount == 0);
impl->mutationIndex = impl->mutationCount - 1;