diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-05-23 08:37:54 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-05-23 11:26:36 +0000 |
commit | 60b628f977102f905b67f23d765cf19e49fa21db (patch) | |
tree | 5e58abcb9cddb3385251a08a26d7b14e0f2167b1 /searchlib/src/tests/btree | |
parent | bbc62a7d9f6a0ec4e0eaafff3213dfebc49898a8 (diff) |
Move RcuVector and relevant support classes to vespalib
Having RCU support available across all our C++ modules open up
new opportunities for optimizations.
This changes the following:
- `RcuVector` moved from `searchlib` to `vespalib`
- `MemoryUsage` moved from `searchlib` to `vespalib`
- Introduce a simplified, more generic `GrowStrategy` in `vespalib`
used by the moved `RcuVector` which does not have any notion of
documents. Existing searchlib `GrowStrategy` gets a simple function
to convert to this generic strategy.
Diffstat (limited to 'searchlib/src/tests/btree')
-rw-r--r-- | searchlib/src/tests/btree/btree_test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/searchlib/src/tests/btree/btree_test.cpp b/searchlib/src/tests/btree/btree_test.cpp index 1f39c7315e8..32c3f952e47 100644 --- a/searchlib/src/tests/btree/btree_test.cpp +++ b/searchlib/src/tests/btree/btree_test.cpp @@ -172,7 +172,7 @@ private: bool assertLeafNode(const std::string & exp, const LeafNodeType & n); bool assertSeek(int skey, int ekey, const MyTree & tree); bool assertSeek(int skey, int ekey, MyTree::Iterator & itr); - bool assertMemoryUsage(const MemoryUsage & exp, const MemoryUsage & act); + bool assertMemoryUsage(const vespalib::MemoryUsage & exp, const vespalib::MemoryUsage & act); void buildSubTree(const std::vector<LeafPair> &sub, @@ -251,7 +251,7 @@ Test::assertSeek(int skey, int ekey, MyTree::Iterator & itr) } bool -Test::assertMemoryUsage(const MemoryUsage & exp, const MemoryUsage & act) +Test::assertMemoryUsage(const vespalib::MemoryUsage & exp, const vespalib::MemoryUsage & act) { if (!EXPECT_EQUAL(exp.allocatedBytes(), act.allocatedBytes())) return false; if (!EXPECT_EQUAL(exp.usedBytes(), act.usedBytes())) return false; @@ -1047,7 +1047,7 @@ Test::requireThatMemoryUsageIsCalculated() GenerationHandler gh; gh.incGeneration(); NodeAllocator tm; - MemoryUsage mu; + vespalib::MemoryUsage mu; const uint32_t initialInternalNodes = 128u; const uint32_t initialLeafNodes = 128u; mu.incAllocatedBytes(adjustAllocatedBytes(initialInternalNodes, sizeof(INode))); @@ -1079,7 +1079,7 @@ Test::requireThatMemoryUsageIsCalculated() tm.transferHoldLists(gh.getCurrentGeneration()); gh.incGeneration(); tm.trimHoldLists(gh.getFirstUsedGeneration()); - mu = MemoryUsage(); + mu = vespalib::MemoryUsage(); mu.incAllocatedBytes(adjustAllocatedBytes(initialInternalNodes, sizeof(INode))); mu.incAllocatedBytes(adjustAllocatedBytes(initialLeafNodes, sizeof(LNode))); mu.incUsedBytes(sizeof(INode) * 2); |