Rename trimHoldLists() -> reclaim_memory().

28 files changed, 89 insertions, 89 deletions

diff --git a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
index 03bc09211b4..caed5c3543c 100644
--- a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
+++ b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
@@ -60,7 +60,7 @@ public:
     void hold(const AtomicEntryRef& ref) { _store.holdElem(ref.load_relaxed(), 1); }
     EntryRef move(EntryRef ref);
     void assign_generation(generation_t current_gen) { _store.assign_generation(current_gen); }
-    void trim_hold_lists(generation_t gen) { _store.trimHoldLists(gen); }
+    void reclaim_memory(generation_t gen) { _store.reclaim_memory(gen); }
     uint32_t get(EntryRef ref) const { return _store.getEntry(ref); }
     uint32_t get_acquire(const AtomicEntryRef& ref) const { return get(ref.load_acquire()); }
     uint32_t get_relaxed(const AtomicEntryRef& ref) const { return get(ref.load_relaxed()); }
@@ -119,7 +119,7 @@ public:
     static uint32_t add_relaxed(uint32_t value) noexcept { return value; }
     static void hold(uint32_t) noexcept { }
     static void assign_generation(generation_t) noexcept { }
-    static void trim_hold_lists(generation_t) noexcept { }
+    static void reclaim_memory(generation_t) noexcept { }
     static uint32_t get(uint32_t value) noexcept { return value; }
     static uint32_t get_acquire(uint32_t value) noexcept { return value; }
     static uint32_t get_relaxed(uint32_t value) noexcept { return value; }
@@ -279,10 +279,10 @@ Fixture<Params>::commit()
     _values.assign_generation(current_gen);
     allocator.assign_generation(_generationHandler.getCurrentGeneration());
     _generationHandler.incGeneration();
-    auto first_used_gen = _generationHandler.get_oldest_used_generation();
-    allocator.trimHoldLists(first_used_gen);
-    _keys.trim_hold_lists(first_used_gen);
-    _values.trim_hold_lists(first_used_gen);
+    auto oldest_used_gen = _generationHandler.get_oldest_used_generation();
+    allocator.reclaim_memory(oldest_used_gen);
+    _keys.reclaim_memory(oldest_used_gen);
+    _values.reclaim_memory(oldest_used_gen);
 }
 
 template <typename Params>
diff --git a/vespalib/src/tests/btree/btree_store/btree_store_test.cpp b/vespalib/src/tests/btree/btree_store/btree_store_test.cpp
index 3dcc4830678..0370b1ce2eb 100644
--- a/vespalib/src/tests/btree/btree_store/btree_store_test.cpp
+++ b/vespalib/src/tests/btree/btree_store/btree_store_test.cpp
@@ -33,7 +33,7 @@ protected:
         _store.freeze();
         _store.assign_generation(_gen_handler.getCurrentGeneration());
         _gen_handler.incGeneration();
-        _store.trimHoldLists(_gen_handler.get_oldest_used_generation());
+        _store.reclaim_memory(_gen_handler.get_oldest_used_generation());
     }
 
     EntryRef add_sequence(int start_key, int end_key)
diff --git a/vespalib/src/tests/btree/btree_test.cpp b/vespalib/src/tests/btree/btree_test.cpp
index 09877e00ac5..f2896cb783c 100644
--- a/vespalib/src/tests/btree/btree_test.cpp
+++ b/vespalib/src/tests/btree/btree_test.cpp
@@ -165,7 +165,7 @@ cleanup(GenerationHandler & g, ManagerType & m)
     m.freeze();
     m.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
-    m.trimHoldLists(g.get_oldest_used_generation());
+    m.reclaim_memory(g.get_oldest_used_generation());
 }
 
 template <typename ManagerType, typename NodeType>
@@ -876,7 +876,7 @@ TEST_F(BTreeTest, require_that_we_can_insert_and_remove_from_tree)
         manager.freeze();
         manager.assign_generation(g.getCurrentGeneration());
         g.incGeneration();
-        manager.trimHoldLists(g.get_oldest_used_generation());
+        manager.reclaim_memory(g.get_oldest_used_generation());
     }
     // remove entries
     for (size_t i = 0; i < numEntries; ++i) {
@@ -1108,7 +1108,7 @@ TEST_F(BTreeTest, require_that_memory_usage_is_calculated)
     // trim hold lists
     tm.assign_generation(gh.getCurrentGeneration());
     gh.incGeneration();
-    tm.trimHoldLists(gh.get_oldest_used_generation());
+    tm.reclaim_memory(gh.get_oldest_used_generation());
     mu = vespalib::MemoryUsage();
     mu.incAllocatedBytes(adjustAllocatedBytes(initialInternalNodes, sizeof(INode)));
     mu.incAllocatedBytes(adjustAllocatedBytes(initialLeafNodes, sizeof(LNode)));
@@ -1284,7 +1284,7 @@ TEST_F(BTreeTest, require_that_small_nodes_works)
     s.freeze();
     s.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
-    s.trimHoldLists(g.get_oldest_used_generation());
+    s.reclaim_memory(g.get_oldest_used_generation());
 }
 
 namespace {
@@ -1418,7 +1418,7 @@ TEST_F(BTreeTest, require_that_apply_works)
     s.freeze();
     s.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
-    s.trimHoldLists(g.get_oldest_used_generation());
+    s.reclaim_memory(g.get_oldest_used_generation());
 }
 
 class MyTreeTestIterator : public MyTree::Iterator
@@ -1555,7 +1555,7 @@ inc_generation(GenerationHandler &g, Tree &t)
     s.freeze();
     s.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
-    s.trimHoldLists(g.get_oldest_used_generation());
+    s.reclaim_memory(g.get_oldest_used_generation());
 }
 
 template <typename Tree>
diff --git a/vespalib/src/tests/btree/btreeaggregation_test.cpp b/vespalib/src/tests/btree/btreeaggregation_test.cpp
index 6bbf9c13790..fb394df9861 100644
--- a/vespalib/src/tests/btree/btreeaggregation_test.cpp
+++ b/vespalib/src/tests/btree/btreeaggregation_test.cpp
@@ -274,7 +274,7 @@ freezeTree(GenerationHandler &g, ManagerType &m)
     m.freeze();
     m.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
-    m.trimHoldLists(g.get_oldest_used_generation());
+    m.reclaim_memory(g.get_oldest_used_generation());
 }
 
 template <typename ManagerType>
@@ -893,7 +893,7 @@ Test::requireThatWeCanInsertAndRemoveFromTree()
         manager.freeze();
         manager.assign_generation(g.getCurrentGeneration());
         g.incGeneration();
-        manager.trimHoldLists(g.get_oldest_used_generation());
+        manager.reclaim_memory(g.get_oldest_used_generation());
     }
     // remove entries
     for (size_t i = 0; i < numEntries; ++i) {
@@ -1192,7 +1192,7 @@ Test::requireThatSmallNodesWorks()
     s.freeze();
     s.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
-    s.trimHoldLists(g.get_oldest_used_generation());
+    s.reclaim_memory(g.get_oldest_used_generation());
 }
 
 void
diff --git a/vespalib/src/tests/btree/frozenbtree_test.cpp b/vespalib/src/tests/btree/frozenbtree_test.cpp
index 55b260fb1d9..0bde2786a0b 100644
--- a/vespalib/src/tests/btree/frozenbtree_test.cpp
+++ b/vespalib/src/tests/btree/frozenbtree_test.cpp
@@ -136,7 +136,7 @@ FrozenBTreeTest::freeTree(bool verbose)
     _allocator->freeze();
     _allocator->assign_generation(_generationHandler->getCurrentGeneration());
     _generationHandler->incGeneration();
-    _allocator->trimHoldLists(_generationHandler->get_oldest_used_generation());
+    _allocator->reclaim_memory(_generationHandler->get_oldest_used_generation());
     delete _tree;
     _tree = NULL;
     delete _allocator;
diff --git a/vespalib/src/tests/datastore/array_store/array_store_test.cpp b/vespalib/src/tests/datastore/array_store/array_store_test.cpp
index 01c97bc98ab..afef530b33e 100644
--- a/vespalib/src/tests/datastore/array_store/array_store_test.cpp
+++ b/vespalib/src/tests/datastore/array_store/array_store_test.cpp
@@ -123,7 +123,7 @@ struct ArrayStoreTest : public TestT
     void assert_ref_reused(const EntryVector& first, const EntryVector& second, bool should_reuse) {
         EntryRef ref1 = add(first);
         remove(ref1);
-        trimHoldLists();
+        reclaim_memory();
         EntryRef ref2 = add(second);
         EXPECT_EQ(should_reuse, (ref2 == ref1));
         assertGet(ref2, second);
@@ -136,9 +136,9 @@ struct ArrayStoreTest : public TestT
         }
         return EntryRef();
     }
-    void trimHoldLists() {
+    void reclaim_memory() {
         store.assign_generation(generation++);
-        store.trimHoldLists(generation);
+        store.reclaim_memory(generation);
     }
     void compactWorst(bool compactMemory, bool compactAddressSpace) {
         CompactionSpec compaction_spec(compactMemory, compactAddressSpace);
@@ -283,7 +283,7 @@ TEST_P(NumberStoreTest, track_size_of_large_array_allocations_with_free_lists_en
     assert_buffer_stats(ref, TestBufferStats().used(2).hold(0).dead(1).extra_used(16));
     remove({1,2,3,4});
     assert_buffer_stats(ref, TestBufferStats().used(2).hold(1).dead(1).extra_hold(16).extra_used(16));
-    trimHoldLists();
+    reclaim_memory();
     assert_buffer_stats(ref, TestBufferStats().used(2).hold(0).dead(2).extra_used(0));
     add({5,6,7,8,9});
     assert_buffer_stats(ref, TestBufferStats().used(2).hold(0).dead(1).extra_used(20));
@@ -316,7 +316,7 @@ test_compaction(NumberStoreBasicTest &f)
     EntryRef size2Ref = f.add({2,2});
     EntryRef size3Ref = f.add({3,3,3});
     f.remove(f.add({5,5}));
-    f.trimHoldLists();
+    f.reclaim_memory();
     f.assertBufferState(size1Ref, MemStats().used(1).dead(0));
     f.assertBufferState(size2Ref, MemStats().used(4).dead(2));
     f.assertBufferState(size3Ref, MemStats().used(2).dead(1)); // Note: First element is reserved
@@ -335,7 +335,7 @@ test_compaction(NumberStoreBasicTest &f)
     EXPECT_NE(size2BufferId, f.getBufferId(f.getEntryRef({2,2})));
     f.assertGet(size2Ref, {2,2}); // Old ref should still point to data.
     EXPECT_TRUE(f.store.bufferState(size2Ref).isOnHold());
-    f.trimHoldLists();
+    f.reclaim_memory();
     EXPECT_TRUE(f.store.bufferState(size2Ref).isFree());
 }
 
@@ -360,7 +360,7 @@ void testCompaction(NumberStoreTest &f, bool compactMemory, bool compactAddressS
     f.remove(f.add({5,5,5}));
     f.remove(f.add({6}));
     f.remove(f.add({7}));
-    f.trimHoldLists();
+    f.reclaim_memory();
     f.assertBufferState(size1Ref, MemStats().used(3).dead(2));
     f.assertBufferState(size2Ref, MemStats().used(2).dead(0));
     f.assertBufferState(size3Ref, MemStats().used(6).dead(3));
@@ -397,7 +397,7 @@ void testCompaction(NumberStoreTest &f, bool compactMemory, bool compactAddressS
         EXPECT_FALSE(f.store.bufferState(size1Ref).isOnHold());
     }
     EXPECT_FALSE(f.store.bufferState(size2Ref).isOnHold());
-    f.trimHoldLists();
+    f.reclaim_memory();
     if (compactMemory) {
         EXPECT_TRUE(f.store.bufferState(size3Ref).isFree());
     } else {
@@ -436,7 +436,7 @@ TEST_P(NumberStoreTest, used_onHold_and_dead_memory_usage_is_tracked_for_small_a
     assertMemoryUsage(exp.used(entrySize() * 3));
     remove({1,2,3});
     assertMemoryUsage(exp.hold(entrySize() * 3));
-    trimHoldLists();
+    reclaim_memory();
     assertMemoryUsage(exp.holdToDead(entrySize() * 3));
 }
 
@@ -447,7 +447,7 @@ TEST_P(NumberStoreTest, used_onHold_and_dead_memory_usage_is_tracked_for_large_a
     assertMemoryUsage(exp.used(largeArraySize() + entrySize() * 4));
     remove({1,2,3,4});
     assertMemoryUsage(exp.hold(largeArraySize() + entrySize() * 4));
-    trimHoldLists();
+    reclaim_memory();
     assertMemoryUsage(exp.decUsed(entrySize() * 4).decHold(largeArraySize() + entrySize() * 4).
             dead(largeArraySize()));
 }
diff --git a/vespalib/src/tests/datastore/datastore/datastore_test.cpp b/vespalib/src/tests/datastore/datastore/datastore_test.cpp
index cd1f869ab64..10b96a87444 100644
--- a/vespalib/src/tests/datastore/datastore/datastore_test.cpp
+++ b/vespalib/src/tests/datastore/datastore/datastore_test.cpp
@@ -283,7 +283,7 @@ TEST(DataStoreTest, require_that_we_can_hold_and_trim_buffers)
     EXPECT_TRUE(s.getBufferState(1).size() != 0);
     EXPECT_TRUE(s.getBufferState(2).size() != 0);
     EXPECT_TRUE(s.getBufferState(3).size() != 0);
-    s.trimHoldLists(11);
+    s.reclaim_memory(11);
     EXPECT_TRUE(s.getBufferState(0).size() == 0);
     EXPECT_TRUE(s.getBufferState(1).size() != 0);
     EXPECT_TRUE(s.getBufferState(2).size() != 0);
@@ -292,7 +292,7 @@ TEST(DataStoreTest, require_that_we_can_hold_and_trim_buffers)
     s.switch_primary_buffer();
     EXPECT_EQ(0u, s.primary_buffer_id());
     EXPECT_EQ(0u, MyRef(s.addEntry(5)).bufferId());
-    s.trimHoldLists(41);
+    s.reclaim_memory(41);
     EXPECT_TRUE(s.getBufferState(0).size() != 0);
     EXPECT_TRUE(s.getBufferState(1).size() == 0);
     EXPECT_TRUE(s.getBufferState(2).size() == 0);
@@ -446,7 +446,7 @@ TEST(DataStoreTest, require_that_memory_stats_are_calculated)
     m._freeBuffers--;
 
     // trim hold buffer
-    s.trimHoldLists(101);
+    s.reclaim_memory(101);
     m._allocElems -= MyRef::offsetSize();
     m._usedElems = 1;
     m._deadElems = 0;
@@ -485,7 +485,7 @@ TEST(DataStoreTest, require_that_memory_usage_is_calculated)
     EXPECT_EQ(5 * sizeof(int), m.usedBytes());
     EXPECT_EQ(0 * sizeof(int), m.deadBytes());
     EXPECT_EQ(5 * sizeof(int), m.allocatedBytesOnHold());
-    s.trimHoldLists(101);
+    s.reclaim_memory(101);
 }
 
 TEST(DataStoreTest, require_that_we_can_disable_elemement_hold_list)
@@ -514,7 +514,7 @@ TEST(DataStoreTest, require_that_we_can_disable_elemement_hold_list)
     EXPECT_EQ(2 * sizeof(int), m.deadBytes());
     EXPECT_EQ(1 * sizeof(int), m.allocatedBytesOnHold());
     s.assign_generation(100);
-    s.trimHoldLists(101);
+    s.reclaim_memory(101);
 }
 
 using IntGrowStore = GrowStore<int, EntryRefT<24>>;
@@ -636,7 +636,7 @@ TEST(DataStoreTest, can_set_memory_allocator)
         s.holdBuffer(0);
         s.assign_generation(10);
         EXPECT_EQ(AllocStats(3, 0), stats);
-        s.trimHoldLists(11);
+        s.reclaim_memory(11);
         EXPECT_EQ(AllocStats(3, 2), stats);
     }
     EXPECT_EQ(AllocStats(3, 3), stats);
@@ -694,7 +694,7 @@ void test_free_element_to_held_buffer(bool direct, bool before_hold_buffer)
         }
     }
     s.assign_generation(100);
-    s.trimHoldLists(101);
+    s.reclaim_memory(101);
 }
 
 }
diff --git a/vespalib/src/tests/datastore/fixed_size_hash_map/fixed_size_hash_map_test.cpp b/vespalib/src/tests/datastore/fixed_size_hash_map/fixed_size_hash_map_test.cpp
index 053cb804f21..4f4c3ac94eb 100644
--- a/vespalib/src/tests/datastore/fixed_size_hash_map/fixed_size_hash_map_test.cpp
+++ b/vespalib/src/tests/datastore/fixed_size_hash_map/fixed_size_hash_map_test.cpp
@@ -92,8 +92,8 @@ DataStoreFixedSizeHashTest::commit()
     _hash_map->assign_generation(_generation_handler.getCurrentGeneration());
     _generation_holder.assign_generation(_generation_handler.getCurrentGeneration());
     _generation_handler.incGeneration();
-    _store.trimHoldLists(_generation_handler.get_oldest_used_generation());
-    _hash_map->trim_hold_lists(_generation_handler.get_oldest_used_generation());
+    _store.reclaim_memory(_generation_handler.get_oldest_used_generation());
+    _hash_map->reclaim_memory(_generation_handler.get_oldest_used_generation());
     _generation_holder.reclaim(_generation_handler.get_oldest_used_generation());
 }
 
diff --git a/vespalib/src/tests/datastore/sharded_hash_map/sharded_hash_map_test.cpp b/vespalib/src/tests/datastore/sharded_hash_map/sharded_hash_map_test.cpp
index d19a45a263e..4c3fe1756c5 100644
--- a/vespalib/src/tests/datastore/sharded_hash_map/sharded_hash_map_test.cpp
+++ b/vespalib/src/tests/datastore/sharded_hash_map/sharded_hash_map_test.cpp
@@ -171,8 +171,8 @@ DataStoreShardedHashTest::commit()
     _store.assign_generation(_generationHandler.getCurrentGeneration());
     _hash_map.assign_generation(_generationHandler.getCurrentGeneration());
     _generationHandler.incGeneration();
-    _store.trimHoldLists(_generationHandler.get_oldest_used_generation());
-    _hash_map.trim_hold_lists(_generationHandler.get_oldest_used_generation());
+    _store.reclaim_memory(_generationHandler.get_oldest_used_generation());
+    _hash_map.reclaim_memory(_generationHandler.get_oldest_used_generation());
 }
 
 void
diff --git a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
index ff5b040dbf6..48a0ecafbc6 100644
--- a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
+++ b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
@@ -112,10 +112,10 @@ struct TestBase : public ::testing::Test {
         }
         return EntryRef();
     }
-    void trimHoldLists() {
+    void reclaim_memory() {
         store.freeze();
         store.assign_generation(generation++);
-        store.trimHoldLists(generation);
+        store.reclaim_memory(generation);
     }
     void compactWorst() {
         CompactionSpec compaction_spec(true, true);
@@ -364,7 +364,7 @@ TYPED_TEST(TestBase, store_can_be_compacted)
     EntryRef val0Ref = this->add(this->values()[0]);
     EntryRef val1Ref = this->add(this->values()[1]);
     this->remove(this->add(this->values()[2]));
-    this->trimHoldLists();
+    this->reclaim_memory();
     size_t reserved = this->get_reserved(val0Ref);
     size_t array_size = this->get_array_size(val0Ref);
     this->assertBufferState(val0Ref, TestBufferStats().used(reserved + 3 * array_size).dead(reserved + array_size));
@@ -381,7 +381,7 @@ TYPED_TEST(TestBase, store_can_be_compacted)
     this->assertGet(val0Ref, this->values()[0]);
     this->assertGet(val1Ref, this->values()[1]);
     EXPECT_TRUE(this->store.bufferState(val0Ref).isOnHold());
-    this->trimHoldLists();
+    this->reclaim_memory();
     EXPECT_TRUE(this->store.bufferState(val0Ref).isFree());
     this->assertStoreContent();
 }
@@ -415,7 +415,7 @@ TYPED_TEST(TestBase, store_can_be_enumerated)
     EntryRef val0Ref = this->add(this->values()[0]);
     EntryRef val1Ref = this->add(this->values()[1]);
     this->remove(this->add(this->values()[2]));
-    this->trimHoldLists();
+    this->reclaim_memory();
 
     auto enumerator = this->getEnumerator(true);
     std::vector<uint32_t> refs;
@@ -460,7 +460,7 @@ TEST_F(DoubleTest, nan_is_handled)
     for (auto &value : myvalues) {
         refs.emplace_back(add(value));
     }
-    trimHoldLists();
+    reclaim_memory();
     EXPECT_TRUE(std::isnan(store.get(refs[1])));
     EXPECT_TRUE(std::signbit(store.get(refs[1])));
     EXPECT_TRUE(std::isinf(store.get(refs[2])));
diff --git a/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp b/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp
index 1ee9e354285..496bc814d0d 100644
--- a/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp
+++ b/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp
@@ -64,7 +64,7 @@ struct UniqueStoreDictionaryTest : public ::testing::Test {
         dict.freeze();
         dict.assign_generation(gen_handler.getCurrentGeneration());
         gen_handler.incGeneration();
-        dict.trim_hold_lists(gen_handler.get_oldest_used_generation());
+        dict.reclaim_memory(gen_handler.get_oldest_used_generation());
     }
     void take_snapshot() {
         dict.freeze();
diff --git a/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp b/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp
index 4835af53b34..e865239787b 100644
--- a/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp
+++ b/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp
@@ -67,9 +67,9 @@ struct TestBase : public ::testing::Test {
         EXPECT_EQ(expStats._extra_used, buffer_state(ref).stats().extra_used_bytes());
         EXPECT_EQ(expStats._extra_hold, buffer_state(ref).stats().extra_hold_bytes());
     }
-    void trim_hold_lists() {
+    void reclaim_memory() {
         allocator.get_data_store().assign_generation(generation++);
-        allocator.get_data_store().trimHoldLists(generation);
+        allocator.get_data_store().reclaim_memory(generation);
     }
 };
 
@@ -89,7 +89,7 @@ TEST_F(StringTest, elements_are_put_on_hold_when_value_is_removed)
     assert_buffer_state(ref, TestBufferStats().used(16).hold(0).dead(0));
     remove(ref);
     assert_buffer_state(ref, TestBufferStats().used(16).hold(16).dead(0));
-    trim_hold_lists();
+    reclaim_memory();
     assert_buffer_state(ref, TestBufferStats().used(16).hold(0).dead(16));
 }
 
@@ -100,7 +100,7 @@ TEST_F(StringTest, extra_bytes_used_is_tracked)
     assert_buffer_state(ref, TestBufferStats().used(2).hold(0).dead(1).extra_used(1001));
     remove(ref);
     assert_buffer_state(ref, TestBufferStats().used(2).hold(1).dead(1).extra_used(1001).extra_hold(1001));
-    trim_hold_lists();
+    reclaim_memory();
     assert_buffer_state(ref, TestBufferStats().used(2).hold(0).dead(2));
     ref = add(spaces1000.c_str());
     assert_buffer_state(ref, TestBufferStats().used(2).hold(0).dead(1).extra_used(1001));
@@ -110,7 +110,7 @@ TEST_F(StringTest, extra_bytes_used_is_tracked)
     remove(ref);
     remove(ref2);
     assert_buffer_state(ref, TestBufferStats().used(3).hold(2).dead(1).extra_used(2002).extra_hold(2002));
-    trim_hold_lists();
+    reclaim_memory();
     assert_buffer_state(ref, TestBufferStats().used(3).hold(0).dead(3));
 }
 
@@ -134,7 +134,7 @@ TEST_F(StringTest, free_list_is_used_when_enabled)
     EntryRef ref2 = add(spaces1000.c_str());
     remove(ref1);
     remove(ref2);
-    trim_hold_lists();
+    reclaim_memory();
     EntryRef ref3 = add(small.c_str());
     EntryRef ref4 = add(spaces1000.c_str());
     EXPECT_EQ(ref1, ref3);
@@ -150,7 +150,7 @@ TEST_F(StringTest, free_list_is_not_used_when_disabled)
     EntryRef ref2 = add(spaces1000.c_str());
     remove(ref1);
     remove(ref2);
-    trim_hold_lists();
+    reclaim_memory();
     EntryRef ref3 = add(small.c_str());
     EntryRef ref4 = add(spaces1000.c_str());
     EXPECT_NE(ref1, ref3);
@@ -168,7 +168,7 @@ TEST_F(StringTest, free_list_is_never_used_for_move_on_compact)
     EntryRef ref4 = add(spaces1000.c_str());
     remove(ref3);
     remove(ref4);
-    trim_hold_lists();
+    reclaim_memory();
     EntryRef ref5 = move_on_compact(ref1);
     EntryRef ref6 = move_on_compact(ref2);
     EXPECT_NE(ref5, ref3);
diff --git a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h
index 6835ca723d4..f803fce26b6 100644
--- a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h
+++ b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h
@@ -101,7 +101,7 @@ public:
     /**
      * Try to free held nodes if nobody can be referencing them.
      */
-    void trimHoldLists(generation_t usedGen);
+    void reclaim_memory(generation_t oldest_used_gen);
 
     /**
      * Transfer nodes from hold1 lists to hold2 lists, they are no
diff --git a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp
index 30dea7bf28b..8c10538acf7 100644
--- a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp
+++ b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp
@@ -266,9 +266,9 @@ template <typename KeyT, typename DataT, typename AggrT,
           size_t INTERNAL_SLOTS, size_t LEAF_SLOTS>
 void
 BTreeNodeAllocator<KeyT, DataT, AggrT, INTERNAL_SLOTS, LEAF_SLOTS>::
-trimHoldLists(generation_t usedGen)
+reclaim_memory(generation_t oldest_used_gen)
 {
-    _nodeStore.trimHoldLists(usedGen);
+    _nodeStore.reclaim_memory(oldest_used_gen);
 }
 
 template <typename KeyT, typename DataT, typename AggrT,
diff --git a/vespalib/src/vespa/vespalib/btree/btreenodestore.h b/vespalib/src/vespa/vespalib/btree/btreenodestore.h
index 28efd3b4efe..7d273c65e0e 100644
--- a/vespalib/src/vespa/vespalib/btree/btreenodestore.h
+++ b/vespalib/src/vespa/vespalib/btree/btreenodestore.h
@@ -172,8 +172,8 @@ public:
     }
 
     // Inherit doc from DataStoreBase
-    void trimHoldLists(generation_t usedGen) {
-        _store.trimHoldLists(usedGen);
+    void reclaim_memory(generation_t oldest_used_gen) {
+        _store.reclaim_memory(oldest_used_gen);
     }
 
     void clearHoldLists() {
diff --git a/vespalib/src/vespa/vespalib/btree/btreestore.h b/vespalib/src/vespa/vespalib/btree/btreestore.h
index 66a1c53814d..7bb7f978ae1 100644
--- a/vespalib/src/vespa/vespalib/btree/btreestore.h
+++ b/vespalib/src/vespa/vespalib/btree/btreestore.h
@@ -332,10 +332,10 @@ public:
 
     // Inherit doc from DataStoreBase
     void
-    trimHoldLists(generation_t usedGen)
+    reclaim_memory(generation_t oldest_used_gen)
     {
-        _allocator.trimHoldLists(usedGen);
-        _store.trimHoldLists(usedGen);
+        _allocator.reclaim_memory(oldest_used_gen);
+        _store.reclaim_memory(oldest_used_gen);
     }
 
     // Inherit doc from DataStoreBase
diff --git a/vespalib/src/vespa/vespalib/datastore/array_store.h b/vespalib/src/vespa/vespalib/datastore/array_store.h
index d807b02a879..e7662b9eb73 100644
--- a/vespalib/src/vespa/vespalib/datastore/array_store.h
+++ b/vespalib/src/vespa/vespalib/datastore/array_store.h
@@ -115,7 +115,7 @@ public:
 
     // Pass on hold list management to underlying store
     void assign_generation(generation_t current_gen) { _store.assign_generation(current_gen); }
-    void trimHoldLists(generation_t firstUsed) { _store.trimHoldLists(firstUsed); }
+    void reclaim_memory(generation_t oldest_used_gen) { _store.reclaim_memory(oldest_used_gen); }
     vespalib::GenerationHolder &getGenerationHolder() { return _store.getGenerationHolder(); }
     void setInitializing(bool initializing) { _store.setInitializing(initializing); }
 
diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
index 099410a502b..0d0287a1c78 100644
--- a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
+++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
@@ -235,10 +235,10 @@ DataStoreBase::doneHoldBuffer(uint32_t bufferId)
 }
 
 void
-DataStoreBase::trimHoldLists(generation_t usedGen)
+DataStoreBase::reclaim_memory(generation_t oldest_used_gen)
 {
-    reclaim_entry_refs(usedGen);  // Trim entries before trimming buffers
-    _genHolder.reclaim(usedGen);
+    reclaim_entry_refs(oldest_used_gen);  // Trim entries before trimming buffers
+    _genHolder.reclaim(oldest_used_gen);
 }
 
 void
diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.h b/vespalib/src/vespa/vespalib/datastore/datastorebase.h
index d334692baad..931f81ee7fd 100644
--- a/vespalib/src/vespa/vespalib/datastore/datastorebase.h
+++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.h
@@ -201,11 +201,11 @@ private:
 
 public:
     /**
-     * Trim hold lists, freeing buffers that no longer needs to be held.
+     * Reclaim memory from hold lists, freeing buffers and entry refs that no longer needs to be held.
      *
-     * @param usedGen       lowest generation that is still used.
+     * @param oldest_used_gen oldest generation that is still used.
      */
-    void trimHoldLists(generation_t usedGen);
+    void reclaim_memory(generation_t oldest_used_gen);
 
     void clearHoldLists();
 
diff --git a/vespalib/src/vespa/vespalib/datastore/fixed_size_hash_map.cpp b/vespalib/src/vespa/vespalib/datastore/fixed_size_hash_map.cpp
index ad3fa7bd235..5338ce0c6b2 100644
--- a/vespalib/src/vespa/vespalib/datastore/fixed_size_hash_map.cpp
+++ b/vespalib/src/vespa/vespalib/datastore/fixed_size_hash_map.cpp
@@ -108,11 +108,11 @@ FixedSizeHashMap::assign_generation_slow(generation_t current_gen)
 
 
 void
-FixedSizeHashMap::trim_hold_lists_slow(generation_t first_used)
+FixedSizeHashMap::reclaim_memory_slow(generation_t oldest_used_gen)
 {
     while (!_hold_2_list.empty()) {
         auto& first = _hold_2_list.front();
-        if (static_cast<sgeneration_t>(first.first - first_used) >= 0) {
+        if (static_cast<sgeneration_t>(first.first - oldest_used_gen) >= 0) {
             break;
         }
         uint32_t node_idx = first.second;
diff --git a/vespalib/src/vespa/vespalib/datastore/fixed_size_hash_map.h b/vespalib/src/vespa/vespalib/datastore/fixed_size_hash_map.h
index e2f4a2a89a5..de05ec1deb0 100644
--- a/vespalib/src/vespa/vespalib/datastore/fixed_size_hash_map.h
+++ b/vespalib/src/vespa/vespalib/datastore/fixed_size_hash_map.h
@@ -57,7 +57,7 @@ private:
  * that memory is held while it can be accessed by reader.
  *
  * The writer must update generation and call assign_generation and
- * trim_hold_lists as needed to free up memory no longer needed by any
+ * reclaim_memory as needed to free up memory no longer needed by any
  * readers.
  */
 class FixedSizeHashMap {
@@ -115,7 +115,7 @@ private:
     uint32_t          _num_shards;
 
     void assign_generation_slow(generation_t current_gen);
-    void trim_hold_lists_slow(generation_t first_used);
+    void reclaim_memory_slow(generation_t oldest_used_gen);
     void force_add(const EntryComparator& comp, const KvType& kv);
 public:
     FixedSizeHashMap(uint32_t module, uint32_t capacity, uint32_t num_shards);
@@ -149,9 +149,9 @@ public:
         }
     }
 
-    void trim_hold_lists(generation_t first_used) {
-        if (!_hold_2_list.empty() && static_cast<sgeneration_t>(_hold_2_list.front().first - first_used) < 0) {
-            trim_hold_lists_slow(first_used);
+    void reclaim_memory(generation_t oldest_used_gen) {
+        if (!_hold_2_list.empty() && static_cast<sgeneration_t>(_hold_2_list.front().first - oldest_used_gen) < 0) {
+            reclaim_memory_slow(oldest_used_gen);
         }
     }
 
diff --git a/vespalib/src/vespa/vespalib/datastore/i_unique_store_dictionary.h b/vespalib/src/vespa/vespalib/datastore/i_unique_store_dictionary.h
index 533407d2f97..5a75a30d182 100644
--- a/vespalib/src/vespa/vespalib/datastore/i_unique_store_dictionary.h
+++ b/vespalib/src/vespa/vespalib/datastore/i_unique_store_dictionary.h
@@ -26,7 +26,7 @@ public:
     virtual ~IUniqueStoreDictionary() = default;
     virtual void freeze() = 0;
     virtual void assign_generation(generation_t current_gen) = 0;
-    virtual void trim_hold_lists(generation_t firstUsed) = 0;
+    virtual void reclaim_memory(generation_t oldest_used_gen) = 0;
     virtual UniqueStoreAddResult add(const EntryComparator& comp, std::function<EntryRef(void)> insertEntry) = 0;
     virtual EntryRef find(const EntryComparator& comp) = 0;
     virtual void remove(const EntryComparator& comp, EntryRef ref) = 0;
diff --git a/vespalib/src/vespa/vespalib/datastore/sharded_hash_map.cpp b/vespalib/src/vespa/vespalib/datastore/sharded_hash_map.cpp
index f72162a6be7..a28c3071646 100644
--- a/vespalib/src/vespa/vespalib/datastore/sharded_hash_map.cpp
+++ b/vespalib/src/vespa/vespalib/datastore/sharded_hash_map.cpp
@@ -119,15 +119,15 @@ ShardedHashMap::assign_generation(generation_t current_gen)
 }
 
 void
-ShardedHashMap::trim_hold_lists(generation_t first_used)
+ShardedHashMap::reclaim_memory(generation_t oldest_used_gen)
 {
     for (size_t i = 0; i < num_shards; ++i) {
         auto map = _maps[i].load(std::memory_order_relaxed);
         if (map != nullptr) {
-            map->trim_hold_lists(first_used);
+            map->reclaim_memory(oldest_used_gen);
         }
     }
-    _gen_holder.reclaim(first_used);
+    _gen_holder.reclaim(oldest_used_gen);
 }
 
 size_t
diff --git a/vespalib/src/vespa/vespalib/datastore/sharded_hash_map.h b/vespalib/src/vespa/vespalib/datastore/sharded_hash_map.h
index 89f24e66e69..572a8790828 100644
--- a/vespalib/src/vespa/vespalib/datastore/sharded_hash_map.h
+++ b/vespalib/src/vespa/vespalib/datastore/sharded_hash_map.h
@@ -29,7 +29,7 @@ struct ICompactable;
  * that memory is held while it can be accessed by reader.
  *
  * The writer must update generation and call assign_generation and
- * trim_hold_lists as needed to free up memory no longer needed by any
+ * reclaim_memory as needed to free up memory no longer needed by any
  * readers.
  */
 class ShardedHashMap {
@@ -53,7 +53,7 @@ public:
     KvType* find(const EntryComparator& comp, EntryRef key_ref);
     const KvType* find(const EntryComparator& comp, EntryRef key_ref) const;
     void assign_generation(generation_t current_gen);
-    void trim_hold_lists(generation_t first_used);
+    void reclaim_memory(generation_t oldest_used_gen);
     size_t size() const noexcept;
     const EntryComparator &get_default_comparator() const noexcept { return *_comp; }
     MemoryUsage get_memory_usage() const;
diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store.h b/vespalib/src/vespa/vespalib/datastore/unique_store.h
index acbb3de3d17..1313d57fbab 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store.h
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store.h
@@ -71,7 +71,7 @@ public:
 
     // Pass on hold list management to underlying store
     void assign_generation(generation_t current_gen);
-    void trimHoldLists(generation_t firstUsed);
+    void reclaim_memory(generation_t oldest_used_gen);
     vespalib::GenerationHolder &getGenerationHolder() { return _store.getGenerationHolder(); }
     void setInitializing(bool initializing) { _store.setInitializing(initializing); }
     void freeze();
diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store.hpp
index 8477111dd01..b8493017020 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store.hpp
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store.hpp
@@ -198,10 +198,10 @@ UniqueStore<EntryT, RefT, Compare, Allocator>::assign_generation(generation_t cu
 
 template <typename EntryT, typename RefT, typename Compare, typename Allocator>
 void
-UniqueStore<EntryT, RefT, Compare, Allocator>::trimHoldLists(generation_t firstUsed)
+UniqueStore<EntryT, RefT, Compare, Allocator>::reclaim_memory(generation_t oldest_used_gen)
 {
-    _dict->trim_hold_lists(firstUsed);
-    _store.trimHoldLists(firstUsed);
+    _dict->reclaim_memory(oldest_used_gen);
+    _store.reclaim_memory(oldest_used_gen);
 }
 
 template <typename EntryT, typename RefT, typename Compare, typename Allocator>
diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.h b/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.h
index 3cbf7b999ff..8c5f284bb14 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.h
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.h
@@ -75,7 +75,7 @@ public:
     ~UniqueStoreDictionary() override;
     void freeze() override;
     void assign_generation(generation_t current_gen) override;
-    void trim_hold_lists(generation_t firstUsed) override;
+    void reclaim_memory(generation_t oldest_used_gen) override;
     UniqueStoreAddResult add(const EntryComparator& comp, std::function<EntryRef(void)> insertEntry) override;
     EntryRef find(const EntryComparator& comp) override;
     void remove(const EntryComparator& comp, EntryRef ref) override;
diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.hpp
index a3a477f334f..6708b4c1448 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.hpp
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.hpp
@@ -53,13 +53,13 @@ UniqueStoreDictionary<BTreeDictionaryT, ParentT, HashDictionaryT>::assign_genera
 
 template <typename BTreeDictionaryT, typename ParentT, typename HashDictionaryT>
 void
-UniqueStoreDictionary<BTreeDictionaryT, ParentT, HashDictionaryT>::trim_hold_lists(generation_t firstUsed)
+UniqueStoreDictionary<BTreeDictionaryT, ParentT, HashDictionaryT>::reclaim_memory(generation_t oldest_used_gen)
 {
     if constexpr (has_btree_dictionary) {
-        this->_btree_dict.getAllocator().trimHoldLists(firstUsed);
+        this->_btree_dict.getAllocator().reclaim_memory(oldest_used_gen);
     }
     if constexpr (has_hash_dictionary) {
-        this->_hash_dict.trim_hold_lists(firstUsed);
+        this->_hash_dict.reclaim_memory(oldest_used_gen);
     }
 }