Track entriesErased in destroyTree

ConflictSet.cpp

@@ -2812,7 +2812,7 @@ Node **insert(Node **self, std::span<const uint8_t> key,
   return self;
 }
 
-void destroyTree(Node *root) {
+void destroyTree(Node *root, int64_t *entriesErased) {
   Arena arena;
   auto toFree = vector<Node *>(arena);
   toFree.push_back(root);
@@ -2827,11 +2827,31 @@ void destroyTree(Node *root) {
   while (toFree.size() > 0) {
     auto *n = toFree.back();
     toFree.pop_back();
-    // Add all children to toFree
-    for (auto c = getChildGeq(n, 0); c != nullptr;
-         c = getChildGeq(n, c->parentsIndex + 1)) {
-      assert(c != nullptr);
-      toFree.push_back(c);
+    *entriesErased += n->entryPresent;
+
+    switch (n->getType()) {
+    case Type_Node0: {
+    } break;
+    case Type_Node3: {
+      auto *n3 = static_cast<Node3 *>(n);
+      toFree.append(std::span<Node *>(n3->children, n3->numChildren));
+    } break;
+    case Type_Node16: {
+      auto *n16 = static_cast<Node16 *>(n);
+      toFree.append(std::span<Node *>(n16->children, n16->numChildren));
+    } break;
+    case Type_Node48: {
+      auto *n48 = static_cast<Node48 *>(n);
+      toFree.append(std::span<Node *>(n48->children, n48->numChildren));
+    } break;
+    case Type_Node256: {
+      auto *n256 = static_cast<Node256 *>(n);
+      auto *out = toFree.unsafePrepareAppend(n256->numChildren).data();
+      n256->bitSet.forEachSet([&](int i) { *out++ = n256->children[i]; });
+      assert(out == toFree.end());
+    } break;
+    default:                   // GCOVR_EXCL_LINE
+      __builtin_unreachable(); // GCOVR_EXCL_LINE
     }
     safe_free(n, n->size());
   }
@@ -3070,7 +3090,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
     if (oldestExtantVersion < writeVersion - kMaxCorrectVersionWindow)
         [[unlikely]] {
       if (writeVersion > newestVersionFullPrecision + kNominalVersionWindow) {
-        destroyTree(root);
+        destroyTree(root, &tls.accum.entries_erased);
         init(writeVersion - kNominalVersionWindow);
       }
 
@@ -3238,7 +3258,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
     initMetrics();
   }
   ~Impl() {
-    destroyTree(root);
+    destroyTree(root, &tls.accum.entries_erased);
     safe_free(metrics, metricsCount * sizeof(metrics[0]));
   }