Merge pull request #6620 from sfc-gh-tclinkenbeard/arena-get-size-boolean-param

Add `FastInaccurateEstimate` boolean parameter for `Arena::getSize`

fdbserver/DeltaTree.h

@@ -1130,7 +1130,8 @@ public:
 		DecodedNode& get(int index) { return decodedNodes[index]; }
 
 		void updateUsedMemory() {
-			int usedNow = sizeof(DeltaTree2) + arena.getSize(true) + (decodedNodes.capacity() * sizeof(DecodedNode));
+			int usedNow = sizeof(DeltaTree2) + arena.getSize(FastInaccurateEstimate::True) +
+			              (decodedNodes.capacity() * sizeof(DecodedNode));
 			if (pMemoryTracker != nullptr) {
 				*pMemoryTracker += (usedNow - lastKnownUsedMemory);
 			}

flow/Arena.cpp

@@ -106,7 +106,9 @@ void* Arena::allocate4kAlignedBuffer(uint32_t size) {
 	return ArenaBlock::dependOn4kAlignedBuffer(impl, size);
 }
 
-size_t Arena::getSize(bool fastInaccurateEstimate) const {
+FDB_DEFINE_BOOLEAN_PARAM(FastInaccurateEstimate);
+
+size_t Arena::getSize(FastInaccurateEstimate fastInaccurateEstimate) const {
 	if (impl) {
 		allowAccess(impl.getPtr());
 		size_t result;
@@ -684,12 +686,12 @@ TEST_CASE("/flow/Arena/Size") {
 	// Note that the ASSERT argument order matters, the estimate must be calculated first as
 	// the full accurate calculation will update the estimate
 	makeString(40, a);
-	fastSize = a.getSize(true);
+	fastSize = a.getSize(FastInaccurateEstimate::True);
 	slowSize = a.getSize();
 	ASSERT_EQ(fastSize, slowSize);
 
 	makeString(700, a);
-	fastSize = a.getSize(true);
+	fastSize = a.getSize(FastInaccurateEstimate::True);
 	slowSize = a.getSize();
 	ASSERT_EQ(fastSize, slowSize);
 
@@ -702,37 +704,37 @@ TEST_CASE("/flow/Arena/Size") {
 
 	makeString(1000, a);
 	makeString(1000, a);
-	fastSize = a.getSize(true);
+	fastSize = a.getSize(FastInaccurateEstimate::True);
 	slowSize = a.getSize();
 	ASSERT_EQ(fastSize, slowSize);
 
 	Standalone<StringRef> s = makeString(500);
 	a.dependsOn(s.arena());
-	fastSize = a.getSize(true);
+	fastSize = a.getSize(FastInaccurateEstimate::True);
 	slowSize = a.getSize();
 	ASSERT_EQ(fastSize, slowSize);
 
 	Standalone<StringRef> s2 = makeString(500);
 	a.dependsOn(s2.arena());
-	fastSize = a.getSize(true);
+	fastSize = a.getSize(FastInaccurateEstimate::True);
 	slowSize = a.getSize();
 	ASSERT_EQ(fastSize, slowSize);
 
 	// Add a dependency to b, which will fit in b's root and update b's size estimate
 	Standalone<StringRef> s3 = makeString(100);
 	b.dependsOn(s3.arena());
-	fastSize = b.getSize(true);
+	fastSize = b.getSize(FastInaccurateEstimate::True);
 	slowSize = b.getSize();
 	ASSERT_EQ(fastSize, slowSize);
 
 	// But now a's size estimate is out of date because the new reference in b's root is still
 	// in a's tree
-	fastSize = a.getSize(true);
+	fastSize = a.getSize(FastInaccurateEstimate::True);
 	slowSize = a.getSize();
 	ASSERT_LT(fastSize, slowSize);
 
 	// Now that a full size calc has been done on a, the estimate is up to date.
-	fastSize = a.getSize(true);
+	fastSize = a.getSize(FastInaccurateEstimate::True);
 	slowSize = a.getSize();
 	ASSERT_EQ(fastSize, slowSize);
 
@@ -741,10 +743,10 @@ TEST_CASE("/flow/Arena/Size") {
 	// unchanged and the same.  The size and estimate of c will also match.
 	Standalone<StringRef> s4 = makeString(100);
 	c.dependsOn(s4.arena());
-	fastSize = c.getSize(true);
+	fastSize = c.getSize(FastInaccurateEstimate::True);
 	slowSize = c.getSize();
 	ASSERT_EQ(fastSize, slowSize);
-	fastSize = a.getSize(true);
+	fastSize = a.getSize(FastInaccurateEstimate::True);
 	slowSize = a.getSize();
 	ASSERT_EQ(fastSize, slowSize);
 

flow/Arena.h

@@ -24,6 +24,7 @@
 #include <iterator>
 #pragma once
 
+#include "flow/BooleanParam.h"
 #include "flow/FastAlloc.h"
 #include "flow/FastRef.h"
 #include "flow/Error.h"
@@ -88,6 +89,8 @@ protected:
 	NonCopyable& operator=(const NonCopyable&) = delete;
 };
 
+FDB_DECLARE_BOOLEAN_PARAM(FastInaccurateEstimate);
+
 // An Arena is a custom allocator that consists of a set of ArenaBlocks.  Allocation is performed by bumping a pointer
 // on the most recent ArenaBlock until the block is unable to service the next allocation request.  When the current
 // ArenaBlock is full, a new (larger) one is added to the Arena.  Deallocation is not directly supported.  Instead,
@@ -110,7 +113,7 @@ public:
 	// non-root nodes in this Arena's block tree.
 	// When fastInaccurateEstimate is false, all estimates in the block tree will be updated to
 	// be accurate.
-	size_t getSize(bool fastInaccurateEstimate = false) const;
+	size_t getSize(FastInaccurateEstimate = FastInaccurateEstimate::False) const;
 
 	bool hasFree(size_t size, const void* address);