Merge pull request #27509 from vespa-engine/balder/move-count-internal-strucures-cache-structures-correctly

Balder/move count internal strucures cache structures correctly

2 files changed, 1 insertions, 3 deletions

diff --git a/vespalib/src/vespa/vespalib/stllike/cache.h b/vespalib/src/vespa/vespalib/stllike/cache.h
index f7456cda197..97ba23aba65 100644
--- a/vespalib/src/vespa/vespalib/stllike/cache.h
+++ b/vespalib/src/vespa/vespalib/stllike/cache.h
@@ -110,7 +110,7 @@ public:
      */
     bool hasKey(const K & key) const;
 
-    CacheStats get_stats() const;
+    virtual CacheStats get_stats() const;
 
     size_t          getHit() const { return _hit.load(std::memory_order_relaxed); }
     size_t         getMiss() const { return _miss.load(std::memory_order_relaxed); }
diff --git a/vespalib/src/vespa/vespalib/stllike/cache.hpp b/vespalib/src/vespa/vespalib/stllike/cache.hpp
index 4e7736c9e5f..f767cf9812c 100644
--- a/vespalib/src/vespa/vespalib/stllike/cache.hpp
+++ b/vespalib/src/vespa/vespalib/stllike/cache.hpp
@@ -61,9 +61,7 @@ cache<P>::getStaticMemoryUsage() const {
     MemoryUsage usage;
     auto cacheGuard = getGuard();
     usage.incAllocatedBytes(sizeof(*this));
-    usage.incAllocatedBytes(Lru::capacity()*sizeof(typename Lru::value_type));
     usage.incUsedBytes(sizeof(*this));
-    usage.incUsedBytes(Lru::size()*sizeof(typename Lru::value_type));
     return usage;
 }