Changeset 1750

Timestamp:

12/14/10 14:35:44 (2 years ago)

Author:

ahu

Message:

implement & document packetcache-bytes and cache-bytes, which return the estimated pre-malloc bytesize usage of these caches

Location:

trunk/pdns/pdns

Files:

• docs/pdns.sgml (modified) (2 diffs)
• rec_channel_rec.cc (modified) (10 diffs)
• recpacketcache.cc (modified) (2 diffs)
• recpacketcache.hh (modified) (1 diff)

trunk/pdns/pdns/docs/pdns.sgml

@@ -9808 +9808 @@
 answers1-10         counts the number of queries answered within 10 miliseconds
 answers-slow        counts the number of queries answered after 1 second
+cache-bytes         Size of the cache in bytes (since 3.3.1)
 cache-entries       shows the number of entries in the cache
 cache-hits          counts the number of cache hits since starting
@@ -9824 +9825 @@
 outgoing-timeouts   counts the number of timeouts on outgoing UDP queries since starting
 over-capacity-drops Questions dropped because over maximum concurrent query limit (since 3.2)
+packetcache-bytes   Size of the packet cache in bytes (since 3.3.1)
 packetcache-entries Size of packet cache (since 3.2)
 packetcache-hits    Packet cache hits (since 3.2)

trunk/pdns/pdns/rec_channel_rec.cc

@@ -299 +299 @@
 }
 
+uint64_t* pleaseGetCacheBytes()
+{
+  return new uint64_t(t_RC->bytes());
+}
+
+
 uint64_t doGetCacheSize()
 {
@@ -304 +310 @@
 }
 
+uint64_t doGetCacheBytes()
+{
+  return broadcastAccFunction<uint64_t>(pleaseGetCacheBytes);
+}
+
 uint64_t* pleaseGetCacheHits()
 {
@@ -325 +336 @@
 
 
-
-
 uint64_t* pleaseGetPacketCacheSize()
 {
@@ -332 +341 @@
 }
 
+uint64_t* pleaseGetPacketCacheBytes()
+{
+  return new uint64_t(t_packetCache->bytes());
+}
+
+
 uint64_t doGetPacketCacheSize()
 {
@@ -337 +352 @@
 }
 
+uint64_t doGetPacketCacheBytes()
+{
+  return broadcastAccFunction<uint64_t>(pleaseGetPacketCacheBytes);
+}
+
+
 uint64_t* pleaseGetPacketCacheHits()
 {
@@ -357 +378 @@
 }
 
+uint64_t doGetMallocated()
+{
+  // this turned out to be broken
+/*  struct mallinfo mi = mallinfo();
+  return mi.uordblks; */
+  return 0;
+}
 
 RecursorControlParser::RecursorControlParser()
@@ -366 +394 @@
   addGetStat("cache-misses", doGetCacheMisses); 
   addGetStat("cache-entries", doGetCacheSize); 
+  addGetStat("cache-bytes", doGetCacheBytes); 
   
   addGetStat("packetcache-hits", doGetPacketCacheHits);
   addGetStat("packetcache-misses", doGetPacketCacheMisses); 
   addGetStat("packetcache-entries", doGetPacketCacheSize); 
-  
-  
+  addGetStat("packetcache-bytes", doGetPacketCacheBytes); 
+  
+  addGetStat("malloc-bytes", doGetMallocated);
   
   addGetStat("servfail-answers", &g_stats.servFails);
@@ -457 +487 @@
 static void doExitNicely()
 {
+  //extern void printCallers();
+  // printCallers();
   doExitGeneric(true);
 }
@@ -531 +563 @@
     *command=&doExitNicely;
     return "bye nicely\n";
-  }
-  
+  }  
 
   if(cmd=="dump-cache") 
@@ -578 +609 @@
     return reloadAuthAndForwards();
   }
-
+  
   return "Unknown command '"+cmd+"'\n";
 }

trunk/pdns/pdns/recpacketcache.cc

@@ -1 +1 @@
 #include <iostream>
+#include <boost/foreach.hpp>
 #include "recpacketcache.hh"
 #include "cachecleaner.hh"
@@ -63 +64 @@
 }
 
+uint64_t RecursorPacketCache::bytes()
+{
+  uint64_t sum=0;
+  BOOST_FOREACH(const struct Entry& e, d_packetCache) {
+    sum += sizeof(e) + e.d_packet.length() + 4;
+  }
+  return sum;
+}
+
+
 void RecursorPacketCache::doPruneTo(unsigned int maxCached)
 {

trunk/pdns/pdns/recpacketcache.hh

@@ -27 +27 @@
   uint64_t d_hits, d_misses;
   uint64_t size();
+  uint64_t bytes();
 
 private: