Rename removeOldGenerations() -> reclaim_memory().

4 files changed, 6 insertions, 6 deletions

diff --git a/vespalib/src/tests/btree/frozenbtree_test.cpp b/vespalib/src/tests/btree/frozenbtree_test.cpp
index 0bde2786a0b..3471d5dc3df 100644
--- a/vespalib/src/tests/btree/frozenbtree_test.cpp
+++ b/vespalib/src/tests/btree/frozenbtree_test.cpp
@@ -114,7 +114,7 @@ FrozenBTreeTest::freeTree(bool verbose)
         static_cast<uint64_t>(_intTree->getUsedMemory()),
         static_cast<uint64_t>(_intTree->getHeldMemory()));
     _intTree->dropFrozen();
-    _intTree->removeOldGenerations(_intTree->getGeneration() + 1);
+    _intTree->reclaim_memory(_intTree->getGeneration() + 1);
     LOG(info,
         "freeTree after unhold: %" PRIu64 " (%" PRIu64 " held)",
         static_cast<uint64_t>(_intTree->getUsedMemory()),
diff --git a/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp b/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp
index 48fc88ec86d..5d6ec3050da 100644
--- a/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp
+++ b/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp
@@ -140,7 +140,7 @@ TEST(RcuVectorTest, generation_handling)
 
     v.setGeneration(2);
     v.push_back(50);
-    v.removeOldGenerations(3);
+    v.reclaim_memory(3);
     EXPECT_EQ(0u, v.getMemoryUsage().allocatedBytesOnHold());
     v.push_back(60); // new array
     EXPECT_EQ(24u, v.getMemoryUsage().allocatedBytesOnHold());
@@ -184,7 +184,7 @@ TEST(RcuVectorTest, memory_usage)
     EXPECT_TRUE(assertUsage(MemoryUsage(6,6,0,2), v.getMemoryUsage()));
     v.push_back(4);
     EXPECT_TRUE(assertUsage(MemoryUsage(12,11,0,6), v.getMemoryUsage()));
-    v.removeOldGenerations(1);
+    v.reclaim_memory(1);
     EXPECT_TRUE(assertUsage(MemoryUsage(6,5,0,0), v.getMemoryUsage()));
 }
 
diff --git a/vespalib/src/vespa/vespalib/util/rcuvector.h b/vespalib/src/vespa/vespalib/util/rcuvector.h
index 5d084fe3815..b0929303692 100644
--- a/vespalib/src/vespa/vespalib/util/rcuvector.h
+++ b/vespalib/src/vespa/vespalib/util/rcuvector.h
@@ -182,7 +182,7 @@ public:
     /**
      * Remove all old data vectors where generation < firstUsed.
      **/
-    void removeOldGenerations(generation_t firstUsed);
+    void reclaim_memory(generation_t oldest_used_gen);
 
     MemoryUsage getMemoryUsage() const override;
 };
diff --git a/vespalib/src/vespa/vespalib/util/rcuvector.hpp b/vespalib/src/vespa/vespalib/util/rcuvector.hpp
index e551bb17db0..eadda8ac1e9 100644
--- a/vespalib/src/vespa/vespalib/util/rcuvector.hpp
+++ b/vespalib/src/vespa/vespalib/util/rcuvector.hpp
@@ -187,9 +187,9 @@ RcuVector<T>::~RcuVector()
 
 template <typename T>
 void
-RcuVector<T>::removeOldGenerations(generation_t firstUsed)
+RcuVector<T>::reclaim_memory(generation_t oldest_used_gen)
 {
-    _genHolderStore.reclaim(firstUsed);
+    _genHolderStore.reclaim(oldest_used_gen);
 }
 
 template <typename T>