Rename first used generation -> oldest used generation.

13 files changed, 51 insertions, 51 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 3ba7bf85e42..2c9455701f7 100644
--- a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
+++ b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
@@ -279,7 +279,7 @@ Fixture<Params>::commit()
     _values.transfer_hold_lists(current_gen);
     allocator.transferHoldLists(_generationHandler.getCurrentGeneration());
     _generationHandler.incGeneration();
-    auto first_used_gen = _generationHandler.getFirstUsedGeneration();
+    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);
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 4da34c64ed9..5196d08aa1b 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.transferHoldLists(_gen_handler.getCurrentGeneration());
         _gen_handler.incGeneration();
-        _store.trimHoldLists(_gen_handler.getFirstUsedGeneration());
+        _store.trimHoldLists(_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 3fd00a26189..8aeef40c957 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.transferHoldLists(g.getCurrentGeneration());
     g.incGeneration();
-    m.trimHoldLists(g.getFirstUsedGeneration());
+    m.trimHoldLists(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.transferHoldLists(g.getCurrentGeneration());
         g.incGeneration();
-        manager.trimHoldLists(g.getFirstUsedGeneration());
+        manager.trimHoldLists(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.transferHoldLists(gh.getCurrentGeneration());
     gh.incGeneration();
-    tm.trimHoldLists(gh.getFirstUsedGeneration());
+    tm.trimHoldLists(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.transferHoldLists(g.getCurrentGeneration());
     g.incGeneration();
-    s.trimHoldLists(g.getFirstUsedGeneration());
+    s.trimHoldLists(g.get_oldest_used_generation());
 }
 
 namespace {
@@ -1418,7 +1418,7 @@ TEST_F(BTreeTest, require_that_apply_works)
     s.freeze();
     s.transferHoldLists(g.getCurrentGeneration());
     g.incGeneration();
-    s.trimHoldLists(g.getFirstUsedGeneration());
+    s.trimHoldLists(g.get_oldest_used_generation());
 }
 
 class MyTreeTestIterator : public MyTree::Iterator
@@ -1555,7 +1555,7 @@ inc_generation(GenerationHandler &g, Tree &t)
     s.freeze();
     s.transferHoldLists(g.getCurrentGeneration());
     g.incGeneration();
-    s.trimHoldLists(g.getFirstUsedGeneration());
+    s.trimHoldLists(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 dff7de6660f..fbe8e4c8424 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.transferHoldLists(g.getCurrentGeneration());
     g.incGeneration();
-    m.trimHoldLists(g.getFirstUsedGeneration());
+    m.trimHoldLists(g.get_oldest_used_generation());
 }
 
 template <typename ManagerType>
@@ -893,7 +893,7 @@ Test::requireThatWeCanInsertAndRemoveFromTree()
         manager.freeze();
         manager.transferHoldLists(g.getCurrentGeneration());
         g.incGeneration();
-        manager.trimHoldLists(g.getFirstUsedGeneration());
+        manager.trimHoldLists(g.get_oldest_used_generation());
     }
     // remove entries
     for (size_t i = 0; i < numEntries; ++i) {
@@ -1192,7 +1192,7 @@ Test::requireThatSmallNodesWorks()
     s.freeze();
     s.transferHoldLists(g.getCurrentGeneration());
     g.incGeneration();
-    s.trimHoldLists(g.getFirstUsedGeneration());
+    s.trimHoldLists(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 01748b9edeb..e031b759f62 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->transferHoldLists(_generationHandler->getCurrentGeneration());
     _generationHandler->incGeneration();
-    _allocator->trimHoldLists(_generationHandler->getFirstUsedGeneration());
+    _allocator->trimHoldLists(_generationHandler->get_oldest_used_generation());
     delete _tree;
     _tree = NULL;
     delete _allocator;
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 ad10bc5c7e6..6abfaced867 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,9 +92,9 @@ DataStoreFixedSizeHashTest::commit()
     _hash_map->transfer_hold_lists(_generation_handler.getCurrentGeneration());
     _generation_holder.assign_generation(_generation_handler.getCurrentGeneration());
     _generation_handler.incGeneration();
-    _store.trimHoldLists(_generation_handler.getFirstUsedGeneration());
-    _hash_map->trim_hold_lists(_generation_handler.getFirstUsedGeneration());
-    _generation_holder.reclaim(_generation_handler.getFirstUsedGeneration());
+    _store.trimHoldLists(_generation_handler.get_oldest_used_generation());
+    _hash_map->trim_hold_lists(_generation_handler.get_oldest_used_generation());
+    _generation_holder.reclaim(_generation_handler.get_oldest_used_generation());
 }
 
 size_t
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 d6970e20e8a..67357d780bc 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.transferHoldLists(_generationHandler.getCurrentGeneration());
     _hash_map.transfer_hold_lists(_generationHandler.getCurrentGeneration());
     _generationHandler.incGeneration();
-    _store.trimHoldLists(_generationHandler.getFirstUsedGeneration());
-    _hash_map.trim_hold_lists(_generationHandler.getFirstUsedGeneration());
+    _store.trimHoldLists(_generationHandler.get_oldest_used_generation());
+    _hash_map.trim_hold_lists(_generationHandler.get_oldest_used_generation());
 }
 
 void
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 d0fede5c550..5948303c335 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.transfer_hold_lists(gen_handler.getCurrentGeneration());
         gen_handler.incGeneration();
-        dict.trim_hold_lists(gen_handler.getFirstUsedGeneration());
+        dict.trim_hold_lists(gen_handler.get_oldest_used_generation());
     }
     void take_snapshot() {
         dict.freeze();
diff --git a/vespalib/src/tests/util/generationhandler/generationhandler_test.cpp b/vespalib/src/tests/util/generationhandler/generationhandler_test.cpp
index 00da752a749..0bc72f93a9d 100644
--- a/vespalib/src/tests/util/generationhandler/generationhandler_test.cpp
+++ b/vespalib/src/tests/util/generationhandler/generationhandler_test.cpp
@@ -26,10 +26,10 @@ GenerationHandlerTest::~GenerationHandlerTest() = default;
 TEST_F(GenerationHandlerTest, require_that_generation_can_be_increased)
 {
     EXPECT_EQ(0u, gh.getCurrentGeneration());
-    EXPECT_EQ(0u, gh.getFirstUsedGeneration());
+    EXPECT_EQ(0u, gh.get_oldest_used_generation());
     gh.incGeneration();
     EXPECT_EQ(1u, gh.getCurrentGeneration());
-    EXPECT_EQ(1u, gh.getFirstUsedGeneration());
+    EXPECT_EQ(1u, gh.get_oldest_used_generation());
 }
 
 TEST_F(GenerationHandlerTest, require_that_readers_can_take_guards)
@@ -87,34 +87,34 @@ TEST_F(GenerationHandlerTest, require_that_guards_can_be_copied)
 
 TEST_F(GenerationHandlerTest, require_that_the_first_used_generation_is_correct)
 {
-    EXPECT_EQ(0u, gh.getFirstUsedGeneration());
+    EXPECT_EQ(0u, gh.get_oldest_used_generation());
     gh.incGeneration();
-    EXPECT_EQ(1u, gh.getFirstUsedGeneration());
+    EXPECT_EQ(1u, gh.get_oldest_used_generation());
     {
         GenGuard g1 = gh.takeGuard();
         gh.incGeneration();
         EXPECT_EQ(1u, gh.getGenerationRefCount());
-        EXPECT_EQ(1u, gh.getFirstUsedGeneration());
+        EXPECT_EQ(1u, gh.get_oldest_used_generation());
     }
-    EXPECT_EQ(1u, gh.getFirstUsedGeneration());
-    gh.updateFirstUsedGeneration();	// Only writer should call this
+    EXPECT_EQ(1u, gh.get_oldest_used_generation());
+    gh.update_oldest_used_generation();	// Only writer should call this
     EXPECT_EQ(0u, gh.getGenerationRefCount());
-    EXPECT_EQ(2u, gh.getFirstUsedGeneration());
+    EXPECT_EQ(2u, gh.get_oldest_used_generation());
     {
         GenGuard g1 = gh.takeGuard();
         gh.incGeneration();
         gh.incGeneration();
         EXPECT_EQ(1u, gh.getGenerationRefCount());
-        EXPECT_EQ(2u, gh.getFirstUsedGeneration());
+        EXPECT_EQ(2u, gh.get_oldest_used_generation());
         {
             GenGuard g2 = gh.takeGuard();
-            EXPECT_EQ(2u, gh.getFirstUsedGeneration());
+            EXPECT_EQ(2u, gh.get_oldest_used_generation());
         }
     }
-    EXPECT_EQ(2u, gh.getFirstUsedGeneration());
-    gh.updateFirstUsedGeneration();	// Only writer should call this
+    EXPECT_EQ(2u, gh.get_oldest_used_generation());
+    gh.update_oldest_used_generation();	// Only writer should call this
     EXPECT_EQ(0u, gh.getGenerationRefCount());
-    EXPECT_EQ(4u, gh.getFirstUsedGeneration());
+    EXPECT_EQ(4u, gh.get_oldest_used_generation());
 }
 
 TEST_F(GenerationHandlerTest, require_that_generation_can_grow_large)
@@ -124,7 +124,7 @@ TEST_F(GenerationHandlerTest, require_that_generation_can_grow_large)
         EXPECT_EQ(i, gh.getCurrentGeneration());
         guards.push_back(gh.takeGuard()); // take guard on current generation
         if (i >= 128) {
-            EXPECT_EQ(i - 128, gh.getFirstUsedGeneration());
+            EXPECT_EQ(i - 128, gh.get_oldest_used_generation());
             guards.pop_front();
             EXPECT_EQ(128u, gh.getGenerationRefCount());
         }
diff --git a/vespalib/src/tests/util/generationhandler_stress/generation_handler_stress_test.cpp b/vespalib/src/tests/util/generationhandler_stress/generation_handler_stress_test.cpp
index 74af25b54a8..fd2769fd8b1 100644
--- a/vespalib/src/tests/util/generationhandler_stress/generation_handler_stress_test.cpp
+++ b/vespalib/src/tests/util/generationhandler_stress/generation_handler_stress_test.cpp
@@ -238,7 +238,7 @@ Fixture::write_indirect_work(uint64_t cnt, IndirectContext& context)
     ReadStopper read_stopper(_stopRead);
     uint32_t sleep_cnt = 0;
     ASSERT_EQ(0, _generationHandler.getCurrentGeneration());
-    auto oldest_gen = _generationHandler.getFirstUsedGeneration();
+    auto oldest_gen = _generationHandler.get_oldest_used_generation();
     for (uint64_t i = 0; i < cnt; ++i) {
         auto gen = _generationHandler.getCurrentGeneration();
         // Hold data for gen, write new data for next_gen
@@ -248,7 +248,7 @@ Fixture::write_indirect_work(uint64_t cnt, IndirectContext& context)
         *v_ptr = next_gen;
         context._value_ptr.store(v_ptr, std::memory_order_release);
         _generationHandler.incGeneration();
-        auto first_used_gen = _generationHandler.getFirstUsedGeneration();
+        auto first_used_gen = _generationHandler.get_oldest_used_generation();
         while (oldest_gen < first_used_gen) {
             // Clear data that readers should no longer have access to.
             *context.calc_value_ptr(oldest_gen) = 0;
@@ -258,8 +258,8 @@ Fixture::write_indirect_work(uint64_t cnt, IndirectContext& context)
             // Sleep if writer gets too much ahead of readers.
             std::this_thread::sleep_for(1ms);
             ++sleep_cnt;
-            _generationHandler.updateFirstUsedGeneration();
-            first_used_gen = _generationHandler.getFirstUsedGeneration();
+            _generationHandler.update_oldest_used_generation();
+            first_used_gen = _generationHandler.get_oldest_used_generation();
         }
     }
     _doneWriteWork += cnt;
diff --git a/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp b/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp
index c23065b7468..48fc88ec86d 100644
--- a/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp
+++ b/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp
@@ -434,7 +434,7 @@ StressFixture::commit()
     auto current_gen = generation_handler.getCurrentGeneration();
     g.assign_generation(current_gen);
     generation_handler.incGeneration();
-    auto first_used_gen = generation_handler.getFirstUsedGeneration();
+    auto first_used_gen = generation_handler.get_oldest_used_generation();
     g.reclaim(first_used_gen);
 }
 
diff --git a/vespalib/src/vespa/vespalib/util/generationhandler.cpp b/vespalib/src/vespa/vespalib/util/generationhandler.cpp
index d1cc0271068..3562926d88d 100644
--- a/vespalib/src/vespa/vespalib/util/generationhandler.cpp
+++ b/vespalib/src/vespa/vespalib/util/generationhandler.cpp
@@ -111,7 +111,7 @@ GenerationHandler::Guard::operator=(Guard &&rhs)
 }
 
 void
-GenerationHandler::updateFirstUsedGeneration()
+GenerationHandler::update_oldest_used_generation()
 {
     for (;;) {
         if (_first == _last.load(std::memory_order_relaxed))
@@ -125,12 +125,12 @@ GenerationHandler::updateFirstUsedGeneration()
         toFree->_next = _free;
         _free = toFree;
     }
-    _firstUsedGeneration.store(_first->_generation, std::memory_order_relaxed);
+    _oldest_used_generation.store(_first->_generation, std::memory_order_relaxed);
 }
 
 GenerationHandler::GenerationHandler()
     : _generation(0),
-      _firstUsedGeneration(0),
+      _oldest_used_generation(0),
       _last(nullptr),
       _first(nullptr),
       _free(nullptr),
@@ -144,7 +144,7 @@ GenerationHandler::GenerationHandler()
 
 GenerationHandler::~GenerationHandler(void)
 {
-    updateFirstUsedGeneration();
+    update_oldest_used_generation();
     assert(_first == _last.load(std::memory_order_relaxed));
     while (_free != nullptr) {
         GenerationHold *toFree = _free;
@@ -190,7 +190,7 @@ GenerationHandler::incGeneration()
         // reader
         set_generation(ngen);
         last->_generation.store(ngen, std::memory_order_relaxed);
-        updateFirstUsedGeneration();
+        update_oldest_used_generation();
         return;
     }
     GenerationHold *nhold = nullptr;
@@ -207,7 +207,7 @@ GenerationHandler::incGeneration()
     last->_next = nhold;
     set_generation(ngen);
     _last.store(nhold, std::memory_order_release);
-    updateFirstUsedGeneration();
+    update_oldest_used_generation();
 }
 
 uint32_t
@@ -215,7 +215,7 @@ GenerationHandler::getGenerationRefCount(generation_t gen) const
 {
     if (static_cast<sgeneration_t>(gen - getCurrentGeneration()) > 0)
         return 0u;
-    if (static_cast<sgeneration_t>(getFirstUsedGeneration() - gen) > 0)
+    if (static_cast<sgeneration_t>(get_oldest_used_generation() - gen) > 0)
         return 0u;
     for (GenerationHold *hold = _first; hold != nullptr; hold = hold->_next) {
         if (hold->_generation.load(std::memory_order_relaxed) == gen)
diff --git a/vespalib/src/vespa/vespalib/util/generationhandler.h b/vespalib/src/vespa/vespalib/util/generationhandler.h
index 9637ad0e414..6ba71b7f5fb 100644
--- a/vespalib/src/vespa/vespalib/util/generationhandler.h
+++ b/vespalib/src/vespa/vespalib/util/generationhandler.h
@@ -73,7 +73,7 @@ public:
 
 private:
     std::atomic<generation_t>     _generation;
-    std::atomic<generation_t>     _firstUsedGeneration;
+    std::atomic<generation_t>     _oldest_used_generation;
     std::atomic<GenerationHold *> _last;      // Points to "current generation" entry
     GenerationHold *_first;     // Points to "firstUsedGeneration" entry
     GenerationHold *_free;      // List of free entries
@@ -101,17 +101,17 @@ public:
     void incGeneration();
 
     /**
-     * Update first used generation.
+     * Update the oldest used generation.
      * Should be called by the writer thread.
      */
-    void updateFirstUsedGeneration();
+    void update_oldest_used_generation();
 
     /**
-     * Returns the first generation guarded by a reader.  It might be too low
-     * if writer hasn't updated first used generation after last reader left.
+     * Returns the oldest generation guarded by a reader.
+     * It might be too low if writer hasn't updated oldest used generation after last reader left.
      */
-    generation_t getFirstUsedGeneration() const noexcept {
-        return _firstUsedGeneration.load(std::memory_order_relaxed);
+    generation_t get_oldest_used_generation() const noexcept {
+        return _oldest_used_generation.load(std::memory_order_relaxed);
     }
 
     /**