headers + test fix

Author: byrnedj

cachelib/allocator/MM2Q.h

@@ -402,11 +402,6 @@ class MM2Q {
     //               source node already existed.
     bool replace(T& oldNode, T& newNode) noexcept;
 
-    // Execute provided function under container lock. Function gets
-    // iterator passed as parameter.
-    template <typename F>
-    void withEvictionIterator(F&& f);
-
     // Execute provided function under container lock. Function gets
     // iterator passed as parameter.
     template <typename F>

cachelib/allocator/MMLru-inl.h

@@ -222,22 +222,16 @@ void MMLru::Container<T, HookPtr>::withEvictionIterator(F&& fun) {
   }
 }
 
-template <typename T, MMLru::Hook<T> T::*HookPtr>
-template <typename F>
-void
-MMLru::Container<T, HookPtr>::withEvictionIterator(F&& fun) {
-  lruMutex_->lock_combine([this, &fun]() {
-    fun(Iterator{LockHolder{}, lru_.rbegin()});
-  });
-}
-
 template <typename T, MMLru::Hook<T> T::*HookPtr>
 template <typename F>
 void
 MMLru::Container<T, HookPtr>::withPromotionIterator(F&& fun) {
-  lruMutex_->lock_combine([this, &fun]() {
-    fun(Iterator{LockHolder{}, lru_.begin()});
-  });
+  if (config_.useCombinedLockForIterators) {
+    lruMutex_->lock_combine([this, &fun]() { fun(Iterator{lru_.begin()}); });
+  } else {
+    LockHolder lck{*lruMutex_};
+    fun(Iterator{lru_.begin()});
+  }
 }
 
 template <typename T, MMLru::Hook<T> T::*HookPtr>

cachelib/allocator/MMLru.h

@@ -295,11 +295,6 @@ class MMLru {
     template <typename F>
     void withEvictionIterator(F&& f);
 
-    // Execute provided function under container lock. Function gets
-    // iterator passed as parameter.
-    template <typename F>
-    void withEvictionIterator(F&& f);
-
     template <typename F>
     void withPromotionIterator(F&& f);
 

cachelib/allocator/MMTinyLFU-inl.h

@@ -220,14 +220,6 @@ void MMTinyLFU::Container<T, HookPtr>::withEvictionIterator(F&& fun) {
   fun(Iterator{*this});
 }
 
-template <typename T, MMTinyLFU::Hook<T> T::*HookPtr>
-template <typename F>
-void
-MMTinyLFU::Container<T, HookPtr>::withEvictionIterator(F&& fun) {
-  LockHolder l(lruMutex_);
-  fun(Iterator{LockHolder{}, *this});
-}
-
 template <typename T, MMTinyLFU::Hook<T> T::*HookPtr>
 template <typename F>
 void

cachelib/allocator/MMTinyLFU.h

@@ -470,11 +470,6 @@ class MMTinyLFU {
     // Returns the eviction age stats. See CacheStats.h for details
     EvictionAgeStat getEvictionAgeStat(uint64_t projectedLength) const noexcept;
 
-    // Execute provided function under container lock. Function gets
-    // iterator passed as parameter.
-    template <typename F>
-    void withEvictionIterator(F&& f);
-
     // Execute provided function under container lock. Function gets
     // iterator passed as parameter.
     template <typename F>

cachelib/allocator/tests/ItemTest.cpp

@@ -82,6 +82,8 @@ TEST(ItemTest, ExpiryTime) {
   EXPECT_TRUE(result);
   EXPECT_EQ(tenMins, item->getConfiguredTTL());
 
+  // So that exclusive bit will be set
+  item->markAccessible();
   // Test that writes fail while the item is moving
   item->markExclusive();
   result = item->updateExpiryTime(0);