weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

Rely on bitSet for child existence in Node48

Browse Source
This commit is contained in:
Andrew Noyes
2024-02-09 18:14:07 -08:00
parent f961947e33
commit ddca6e8511
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ConflictSet.cpp
View File

@@ -152,10 +152,7 @@ struct Node48 : Node {
Node *children[48] = {}; Node *children[48] = {};
int8_t nextFree = 0; int8_t nextFree = 0;
int8_t index[256]; int8_t index[256];
Node48() { Node48() { this->type = Type::Node48; }
this->type = Type::Node48;
memset(index, -1, 256);
}
}; };
struct Node256 : Node { struct Node256 : Node {
@@ -241,10 +238,8 @@ Node *&getChildExists(Node *self, uint8_t index) {
return self16->children[getNodeIndex(self16, index)]; return self16->children[getNodeIndex(self16, index)];
} else if (self->type == Type::Node48) { } else if (self->type == Type::Node48) {
auto *self48 = static_cast<Node48 *>(self); auto *self48 = static_cast<Node48 *>(self);
int secondIndex = self48->index[index]; assert(self48->bitSet.test(index));
if (secondIndex >= 0) { return self48->children[self48->index[index]];
return self48->children[secondIndex];
}
} else { } else {
auto *self256 = static_cast<Node256 *>(self); auto *self256 = static_cast<Node256 *>(self);
return self256->children[index]; return self256->children[index];
@@ -416,15 +411,14 @@ Node *&getOrCreateChild(Node *&self, uint8_t index) {
} else if (self->type == Type::Node48) { } else if (self->type == Type::Node48) {
insert48: insert48:
auto *self48 = static_cast<Node48 *>(self); auto *self48 = static_cast<Node48 *>(self);
int secondIndex = self48->index[index]; if (self48->bitSet.test(index)) {
if (secondIndex >= 0) { return self48->children[self48->index[index]];
return self48->children[secondIndex];
} }
if (self->numChildren == 48) { if (self->numChildren == 48) {
auto *newSelf = new (safe_malloc(sizeof(Node256))) Node256; auto *newSelf = new (safe_malloc(sizeof(Node256))) Node256;
memcpy((void *)newSelf, self, offsetof(Node, type)); memcpy((void *)newSelf, self, offsetof(Node, type));
for (int i = 0; i < 256; ++i) { for (int i = 0; i < 256; ++i) {
if (self48->index[i] >= 0) { if (self48->bitSet.test(i)) {
newSelf->bitSet.set(i); newSelf->bitSet.set(i);
newSelf->children[i] = self48->children[self48->index[i]]; newSelf->children[i] = self48->children[self48->index[i]];
} }
@@ -475,7 +469,7 @@ void eraseChild(Node *self, uint8_t index) {
} else if (self->type == Type::Node48) { } else if (self->type == Type::Node48) {
auto *self48 = static_cast<Node48 *>(self); auto *self48 = static_cast<Node48 *>(self);
self48->bitSet.reset(index); self48->bitSet.reset(index);
int8_t toRemoveChildrenIndex = std::exchange(self48->index[index], -1); int8_t toRemoveChildrenIndex = self48->index[index];
int8_t lastChildrenIndex = --self48->nextFree; int8_t lastChildrenIndex = --self48->nextFree;
assert(toRemoveChildrenIndex >= 0); assert(toRemoveChildrenIndex >= 0);
assert(lastChildrenIndex >= 0); assert(lastChildrenIndex >= 0);