v0.34.0_2

src/cache/dashboard.rs

@@ -6,9 +6,6 @@ impl Cache {
             .unwrap_or_else(|e| e.into_inner())
             .clone();
         let mut store = self.store.lock().unwrap_or_else(|e| e.into_inner());
-        self.counters
-            .expired
-            .fetch_add(store.sweep() as u64, Ordering::Relaxed);
         let n = |value: &AtomicU64| value.load(Ordering::Relaxed);
         let hits = n(&self.counters.hits);
         let misses = n(&self.counters.misses);
@@ -180,6 +177,7 @@ impl Cache {
             store.revision = revision;
             self.revision.store(revision, Ordering::Relaxed);
             store.domains.clear();
+            store.domain_count = 0;
         }
         drop(store);
         self.cancel_all_fill_flights();
@@ -247,9 +245,6 @@ impl Cache {
     }
     pub fn scope_view(&self, scope: &str) -> ScopeView {
         let mut store = self.store.lock().unwrap_or_else(|e| e.into_inner());
-        self.counters
-            .expired
-            .fetch_add(store.sweep() as u64, Ordering::Relaxed);
         let mut view = ScopeView {
             entries: 0,
             resident_bytes: 0,
@@ -276,26 +271,32 @@ impl Cache {
                 "MISS" => c.misses += 1,
                 _ => c.bypasses += 1,
             }
-            *c.reasons.entry(reason.into()).or_default() += 1;
+            if let Some(count) = c.reasons.get_mut(reason) {
+                *count = count.saturating_add(1);
+            } else {
+                c.reasons.insert(reason.to_owned(), 1);
+            }
         }
     }
     pub fn record_reason(&self, scope: &str, domain: &str, reason: &'static str) {
         let mut store = self.store.lock().unwrap_or_else(|e| e.into_inner());
         if let Some(c) = store.domain(scope, domain) {
-            *c.reasons.entry(reason.into()).or_default() += 1;
+            if let Some(count) = c.reasons.get_mut(reason) {
+                *count = count.saturating_add(1);
+            } else {
+                c.reasons.insert(reason.to_owned(), 1);
+            }
         }
     }
     pub fn dashboard(&self, scope: Option<&str>, offset: usize, limit: usize) -> Dashboard {
         let mut store = self.store.lock().unwrap_or_else(|e| e.into_inner());
-        self.counters
-            .expired
-            .fetch_add(store.sweep() as u64, Ordering::Relaxed);
         let revision = store.revision;
         let mut groups: BTreeMap<(String, String), DomainView> = store
             .domains
             .iter()
-            .filter(|((vhost, _), _)| scope.is_none_or(|s| s == vhost))
-            .map(|((vhost, domain), counters)| {
+            .filter(|(vhost, _)| scope.is_none_or(|s| s == vhost.as_str()))
+            .flat_map(|(vhost, domains)| domains.iter().map(move |(domain, counters)| (vhost, domain, counters)))
+            .map(|(vhost, domain, counters)| {
                 (
                     (vhost.clone(), domain.clone()),
                     DomainView {