Better way for pruning if cleaning dead entries wasn't enough

diff --git a/pdns/cachecleaner.hh b/pdns/cachecleaner.hh
index a29533c20e407c1f59e4d4e2717529e11fc6abe3..c66e430bb441030d1eacc253190f8f5de638e6be 100644 (file)
--- a/pdns/cachecleaner.hh
+++ b/pdns/cachecleaner.hh
@@ -204,20 +204,23 @@ template <typename S, typename C, typename T> uint64_t pruneMutexCollectionsVect
 
   toTrim -= totErased;
 
-  // XXXX kinda desperate method
   while (toTrim > 0) {
+    size_t pershard = toTrim / maps_size + 1;
     for (auto& mc : maps) {
       const std::lock_guard<std::mutex> lock(mc.mutex);
       mc.d_cachecachevalid = false;
       auto& sidx = boost::multi_index::get<S>(mc.d_map);
-      auto i = sidx.begin();
-      container.preRemoval(*i);
-      i = sidx.erase(i);
-      mc.d_entriesCount--;
-      totErased++;
-      toTrim--;
-      if (toTrim == 0)
-        break;
+      size_t removed = 0;
+      for (auto i = sidx.begin(); i != sidx.end() && removed < pershard; removed++) {
+        container.preRemoval(*i);
+        i = sidx.erase(i);
+        mc.d_entriesCount--;
+        totErased++;
+        toTrim--;
+        if (toTrim == 0) {
+          break;
+        }
+      }
     }
   }
   return totErased;

diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index 3464b7f756b6b1f1cf45c39ee5d7b1e56fae29ef..4ceb1a1f7e9336ea54a614089f379a52824b0f4f 100644 (file)
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -33,7 +33,6 @@ MemRecursorCache::~MemRecursorCache()
 
 size_t MemRecursorCache::size()
 {
-  // XXX!
   size_t count = 0;
   for (auto& map : d_maps) {
     count += map.d_entriesCount;