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

Fix nodes_released accounting

Browse Source
This commit is contained in:
Andrew Noyes
2024-08-13 16:43:04 -07:00
parent 43f6126cc4
commit 3078845673
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ConflictSet.cpp
View File

@@ -1715,7 +1715,7 @@ void maybeDownsize(Node *self, WriteContext *tls, ConflictSet::Impl *impl,
} }
} }
void destroyTree(Node *root, int64_t *entriesErased) { void destroyTree(Node *root, WriteContext::Accum *accum) {
Arena arena; Arena arena;
auto toFree = vector<Node *>(arena); auto toFree = vector<Node *>(arena);
toFree.push_back(root); toFree.push_back(root);
@@ -1730,7 +1730,8 @@ void destroyTree(Node *root, int64_t *entriesErased) {
while (toFree.size() > 0) { while (toFree.size() > 0) {
auto *n = toFree.back(); auto *n = toFree.back();
toFree.pop_back(); toFree.pop_back();
*entriesErased += n->entryPresent; accum->entries_erased += n->entryPresent;
++accum->nodes_released;
switch (n->getType()) { switch (n->getType()) {
case Type_Node0: { case Type_Node0: {
@@ -1770,7 +1771,7 @@ void eraseBetween(Node3 *&n, int begin, int end, WriteContext *tls) {
InternalVersionT *maxVOut = n->childMaxVersion; InternalVersionT *maxVOut = n->childMaxVersion;
for (int i = 0; i < n->numChildren; ++i) { for (int i = 0; i < n->numChildren; ++i) {
if (inBounds(n->index[i])) { if (inBounds(n->index[i])) {
destroyTree(n->children[i], &tls->accum.entries_erased); destroyTree(n->children[i], &tls->accum);
} else { } else {
*nodeOut++ = n->children[i]; *nodeOut++ = n->children[i];
*indexOut++ = n->index[i]; *indexOut++ = n->index[i];
@@ -1796,7 +1797,7 @@ void eraseBetween(Node16 *&n, int begin, int end, WriteContext *tls) {
InternalVersionT *maxVOut = n->childMaxVersion; InternalVersionT *maxVOut = n->childMaxVersion;
for (int i = 0; i < n->numChildren; ++i) { for (int i = 0; i < n->numChildren; ++i) {
if (inBounds(n->index[i])) { if (inBounds(n->index[i])) {
destroyTree(n->children[i], &tls->accum.entries_erased); destroyTree(n->children[i], &tls->accum);
} else { } else {
*nodeOut++ = n->children[i]; *nodeOut++ = n->children[i];
*indexOut++ = n->index[i]; *indexOut++ = n->index[i];
@@ -1833,7 +1834,7 @@ void eraseBetween(Node48 *&n, int begin, int end, WriteContext *tls) {
n->nextFree = 0; n->nextFree = 0;
for (int i = 0; i < n->numChildren; ++i) { for (int i = 0; i < n->numChildren; ++i) {
if (inBounds(n->reverseIndex[i])) { if (inBounds(n->reverseIndex[i])) {
destroyTree(n->children[i], &tls->accum.entries_erased); destroyTree(n->children[i], &tls->accum);
} else { } else {
*nodeOut++ = n->children[i]; *nodeOut++ = n->children[i];
*indexOut++ = n->reverseIndex[i]; *indexOut++ = n->reverseIndex[i];
@@ -1872,8 +1873,7 @@ void eraseBetween(Node256 *&n, int begin, int end, WriteContext *tls) {
BitSet newBitSet; BitSet newBitSet;
n->bitSet.forEachSet([&](int i) { n->bitSet.forEachSet([&](int i) {
if (inBounds(i)) { if (inBounds(i)) {
destroyTree(std::exchange(n->children[i], nullptr), destroyTree(std::exchange(n->children[i], nullptr), &tls->accum);
&tls->accum.entries_erased);
} else { } else {
++n->numChildren; ++n->numChildren;
newBitSet.set(i); newBitSet.set(i);
@@ -3393,7 +3393,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
if (oldestExtantVersion < writeVersion - kMaxCorrectVersionWindow) if (oldestExtantVersion < writeVersion - kMaxCorrectVersionWindow)
[[unlikely]] { [[unlikely]] {
if (writeVersion > newestVersionFullPrecision + kNominalVersionWindow) { if (writeVersion > newestVersionFullPrecision + kNominalVersionWindow) {
destroyTree(root, &tls.accum.entries_erased); destroyTree(root, &tls.accum);
init(writeVersion - kNominalVersionWindow); init(writeVersion - kNominalVersionWindow);
} }
@@ -3562,7 +3562,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
initMetrics(); initMetrics();
} }
~Impl() { ~Impl() {
destroyTree(root, &tls.accum.entries_erased); destroyTree(root, &tls.accum);
safe_free(metrics, metricsCount * sizeof(metrics[0])); safe_free(metrics, metricsCount * sizeof(metrics[0]));
} }