fixed merge after rebase with new develop

Author: byrnedj

cachelib/allocator/CacheAllocator-inl.h

@@ -1242,7 +1242,7 @@ CacheAllocator<CacheTrait>::insertOrReplace(const ItemHandle& handle) {
 /* Next two methods are used to asynchronously move Item between memory tiers.
  *
  * The thread, which moves Item, allocates new Item in the tier we are moving to
- * and calls moveRegularItemOnEviction() method. This method does the following:
+ * and calls moveRegularItemWithSync() method. This method does the following:
  *  1. Create MoveCtx and put it to the movesMap.
  *  2. Update the access container with the new item from the tier we are
  *     moving to. This Item has kIncomplete flag set.
@@ -1271,9 +1271,10 @@ bool CacheAllocator<CacheTrait>::addWaitContextForMovingItem(
 }
 
 template <typename CacheTrait>
+template <typename P>
 typename CacheAllocator<CacheTrait>::ItemHandle
-CacheAllocator<CacheTrait>::moveRegularItemOnEviction(
-    Item& oldItem, ItemHandle& newItemHdl) {
+CacheAllocator<CacheTrait>::moveRegularItemWithSync(
+    Item& oldItem, ItemHandle& newItemHdl, P&& predicate) {
   XDCHECK(oldItem.isMoving());
   // TODO: should we introduce new latency tracker. E.g. evictRegularLatency_
   // ??? util::LatencyTracker tracker{stats_.evictRegularLatency_};
@@ -1333,7 +1334,7 @@ CacheAllocator<CacheTrait>::moveRegularItemOnEviction(
   // it is unsafe to replace the old item with a new one, so we should
   // also abort.
   if (!accessContainer_->replaceIf(oldItem, *newItemHdl,
-                                   itemMovingPredicate)) {
+                                   predicate)) {
     return {};
   }
 
@@ -1707,7 +1708,7 @@ CacheAllocator<CacheTrait>::tryEvictToNextMemoryTier(
 
     if (newItemHdl) {
       XDCHECK_EQ(newItemHdl->getSize(), item.getSize());
-      return moveRegularItemOnEviction(item, newItemHdl);
+      return moveRegularItemWithSync(item, newItemHdl, itemMovingPredicate);
     }
   }
 

cachelib/allocator/CacheAllocator.h

@@ -1420,7 +1420,8 @@ class CacheAllocator : public CacheBase {
   //
   // @return true  If the move was completed, and the containers were updated
   //               successfully.
-  ItemHandle moveRegularItemOnEviction(Item& oldItem, ItemHandle& newItemHdl);
+  template <typename P>
+  ItemHandle moveRegularItemWithSync(Item& oldItem, ItemHandle& newItemHdl, P&& predicate);
 
   // Moves a regular item to a different slab. This should only be used during
   // slab release after the item's moving bit has been set. The user supplied