From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Tue, 14 Dec 2010 13:14:55 +0000 (+0000)
Subject: improve soft-calculated memory use statistics accuracy
X-Git-Tag: rec-3.3.1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e5ed2e4303393f9ae6d70ff8a9cf3171bf2f1ca;p=pdns

improve soft-calculated memory use statistics accuracy


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1748 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index 0c5f4f80c..dcbf23743 100644
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -95,6 +95,7 @@ unsigned int MemRecursorCache::bytes()
   unsigned int ret=0;
 
   for(cache_t::const_iterator i=d_cache.begin(); i!=d_cache.end(); ++i) {
+    ret+=sizeof(struct CacheEntry);
     ret+=(unsigned int)i->d_qname.length();
     for(vector<StoredRecord>::const_iterator j=i->d_records.begin(); j!= i->d_records.end(); ++j)
       ret+=j->size();
diff --git a/pdns/recursor_cache.hh b/pdns/recursor_cache.hh
index 5ddf93a85..f7c9bbb5e 100644
--- a/pdns/recursor_cache.hh
+++ b/pdns/recursor_cache.hh
@@ -57,7 +57,7 @@ private:
 
     unsigned int size() const
     {
-      return ( unsigned int ) 4+d_string.size();
+      return sizeof(*this) + d_string.size();
     }
 
   };