refactored background batch eviction and added DSA support

guptask · Oct 5, 2023 · 708513f · 708513f
1 parent 2041678
commit 708513f
Show file tree

Hide file tree

Showing 17 changed files with 495 additions and 24 deletions.
diff --git a/cachelib/allocator/BackgroundMover-inl.h b/cachelib/allocator/BackgroundMover-inl.h
@@ -19,9 +19,7 @@ namespace cachelib {
 
 template <typename CacheT>
 BackgroundMover<CacheT>::BackgroundMover(
-    Cache& cache,
-    std::shared_ptr<BackgroundMoverStrategy> strategy,
-    MoverDir direction)
+    Cache& cache, std::shared_ptr<BackgroundMoverStrategy> strategy, MoverDir direction)
     : cache_(cache), strategy_(strategy), direction_(direction) {
   if (direction_ == MoverDir::Evict) {
     moverFunc = BackgroundMoverAPIWrapper<CacheT>::traverseAndEvictItems;

diff --git a/cachelib/allocator/BackgroundMover.h b/cachelib/allocator/BackgroundMover.h
@@ -61,7 +61,7 @@ class BackgroundMover : public PeriodicWorker {
   //                            (promoted vs. evicted and how much)
   BackgroundMover(Cache& cache,
                   std::shared_ptr<BackgroundMoverStrategy> strategy,
-                  MoverDir direction_);
+                  MoverDir direction);
 
   ~BackgroundMover() override;
 
@@ -102,9 +102,7 @@ class BackgroundMover : public PeriodicWorker {
   std::shared_ptr<BackgroundMoverStrategy> strategy_;
   MoverDir direction_;
 
-  std::function<size_t(
-      Cache&, unsigned int, unsigned int, unsigned int, size_t)>
-      moverFunc;
+  std::function<size_t(Cache&, unsigned int, unsigned int, unsigned int, size_t)> moverFunc;
 
   // implements the actual logic of running the background evictor
   void work() override final;

diff --git a/cachelib/allocator/CMakeLists.txt b/cachelib/allocator/CMakeLists.txt
@@ -65,6 +65,8 @@ target_link_libraries(cachelib_allocator PUBLIC
   cachelib_navy
   cachelib_common
   cachelib_shm
+  dml
+  dl
   )
 
 if ((CMAKE_SYSTEM_NAME STREQUAL Linux) AND

diff --git a/cachelib/allocator/Cache.cpp b/cachelib/allocator/Cache.cpp
@@ -478,10 +478,21 @@ void CacheBase::updateGlobalCacheStats(const std::string& statPrefix) const {
 
   visitEstimates(uploadStatsNanoToMicro, stats.allocateLatencyNs,
                  statPrefix + "allocate.latency_us");
+
   visitEstimates(uploadStatsNanoToMicro, stats.bgEvictLatencyNs,
                  statPrefix + "background.eviction.latency_us");
+  visitEstimates(uploadStatsNanoToMicro, stats.evictDmlLargeItemWaitLatencyNs,
+                 statPrefix + "background.eviction.dml.large_item_wait.latency_us");
+  visitEstimates(uploadStatsNanoToMicro, stats.evictDmlSmallItemWaitLatencyNs,
+                 statPrefix + "background.eviction.dml.small_item_wait.latency_us");
+
   visitEstimates(uploadStatsNanoToMicro, stats.bgPromoteLatencyNs,
                  statPrefix + "background.promotion.latency_us");
+  visitEstimates(uploadStatsNanoToMicro, stats.promoteDmlLargeItemWaitLatencyNs,
+                 statPrefix + "background.promotion.dml.large_item_wait.latency_us");
+  visitEstimates(uploadStatsNanoToMicro, stats.promoteDmlSmallItemWaitLatencyNs,
+                 statPrefix + "background.promotion.dml.small_item_wait.latency_us");
+
   visitEstimates(uploadStatsNanoToMicro, stats.moveChainedLatencyNs,
                  statPrefix + "move.chained.latency_us");
   visitEstimates(uploadStatsNanoToMicro, stats.moveRegularLatencyNs,