Changeset 1493

Timestamp:

01/07/10 12:57:04 (3 years ago)

Author:

ahu

Message:

add packetcache statistics, plus qps counter in statistics. remove edns stats since we stopped doing edns probing.

Location:

trunk/pdns/pdns

Files:

• pdns_recursor.cc (modified) (3 diffs)
• rec_channel_rec.cc (modified) (2 diffs)
• recpacketcache.cc (modified) (3 diffs)
• recpacketcache.hh (modified) (1 diff)
• syncres.hh (modified) (4 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -94 +94 @@
 
 __thread MemRecursorCache* t_RC;
-static __thread RecursorPacketCache* t_packetCache;
+__thread RecursorPacketCache* t_packetCache;
 RecursorStats g_stats;
 bool g_quiet;
@@ -986 +986 @@
 void doStats(void)
 {
-
+  static time_t lastOutputTime;
+  static uint64_t lastQueryCount;
+  
   if(g_stats.qcounter && (t_RC->cacheHits + t_RC->cacheMisses) && SyncRes::s_queries && SyncRes::s_outqueries) {  // this only runs once thread 0 has had hits
     uint64_t cacheHits = broadcastAccFunction<uint64_t>(pleaseGetCacheHits);
@@ -1005 +1007 @@
       broadcastAccFunction<uint64_t>(pleaseGetConcurrentQueries)<<" queries running, "<<SyncRes::s_outgoingtimeouts<<" outgoing timeouts"<<endl;
 
-    L<<Logger::Warning<<"stats: "<<g_stats.ednsPingMatches<<" ping matches, "<<g_stats.ednsPingMismatches<<" mismatches, "<<
-      g_stats.noPingOutQueries<<" outqueries w/o ping, "<< g_stats.noEdnsOutQueries<<" w/o EDNS"<<endl;
-    // L<<Logger::Warning<<"stats: "<<
-     // cacheHits <<" packet cache hits ("<<(int)(100.0*cacheHits/SyncRes::s_queries) << "%)"<<endl;
+    //L<<Logger::Warning<<"stats: "<<g_stats.ednsPingMatches<<" ping matches, "<<g_stats.ednsPingMismatches<<" mismatches, "<<
+      //g_stats.noPingOutQueries<<" outqueries w/o ping, "<< g_stats.noEdnsOutQueries<<" w/o EDNS"<<endl;
+    
+    L<<Logger::Warning<<"stats: " <<  broadcastAccFunction<uint64_t>(pleaseGetPacketCacheSize) <<
+    " packet cache entries, "<<(int)(100.0*broadcastAccFunction<uint64_t>(pleaseGetPacketCacheHits)/SyncRes::s_queries) << "% packet cache hits"<<endl;
+    
+    time_t now = time(0);
+    if(lastOutputTime && lastQueryCount && now != lastOutputTime) {
+      L<<Logger::Warning<<"stats: "<< (SyncRes::s_queries - lastQueryCount) / (now - lastOutputTime) <<" qps (average over "<< (now - lastOutputTime) << " seconds)"<<endl;
+    }
+    lastOutputTime = now;
+    lastQueryCount = SyncRes::s_queries;
   }
   else if(statsWanted) 

trunk/pdns/pdns/rec_channel_rec.cc

@@ -290 +290 @@
 
 
+
+
+uint64_t* pleaseGetPacketCacheSize()
+{
+  return new uint64_t(t_packetCache->size());
+}
+
+uint64_t doGetPacketCacheSize()
+{
+  return broadcastAccFunction<uint64_t>(pleaseGetPacketCacheSize);
+}
+
+uint64_t* pleaseGetPacketCacheHits()
+{
+  return new uint64_t(t_packetCache->d_hits);
+}
+
+uint64_t doGetPacketCacheHits()
+{
+  return broadcastAccFunction<uint64_t>(pleaseGetPacketCacheHits);
+}
+
+uint64_t* pleaseGetPacketCacheMisses()
+{
+  return new uint64_t(t_packetCache->d_misses);
+}
+
+uint64_t doGetPacketCacheMisses()
+{
+  return broadcastAccFunction<uint64_t>(pleaseGetPacketCacheMisses);
+}
+
+
 RecursorControlParser::RecursorControlParser()
 {
@@ -297 +330 @@
   addGetStat("cache-hits", doGetCacheHits);
   addGetStat("cache-misses", doGetCacheMisses); 
-
   addGetStat("cache-entries", doGetCacheSize); 
+  
+  addGetStat("packetcache-hits", doGetPacketCacheHits);
+  addGetStat("packetcache-misses", doGetPacketCacheMisses); 
+  addGetStat("packetcache-entries", doGetPacketCacheSize); 
+  
+  
+  
   addGetStat("servfail-answers", &g_stats.servFails);
   addGetStat("nxdomain-answers", &g_stats.nxDomains);

trunk/pdns/pdns/recpacketcache.cc

@@ -8 +8 @@
 RecursorPacketCache::RecursorPacketCache()
 {
+  d_hits = d_misses = 0;
 }
 
@@ -20 +21 @@
     *responsePacket = iter->d_packet;
     ((struct dnsheader*)responsePacket->c_str())->id=id;
+    d_hits++;
     return true;
   }
+  d_misses++;
   return false;
 }
@@ -39 +42 @@
 }
 
-
+uint64_t RecursorPacketCache::size()
+{
+  return d_packetCache.size();
+}

trunk/pdns/pdns/recpacketcache.hh

@@ -16 +16 @@
   
   void prune();
+  uint64_t d_hits, d_misses;
+  uint64_t size();
+
 private:
 

trunk/pdns/pdns/syncres.hh

@@ -15 +15 @@
 #include "sstuff.hh"
 #include "recursor_cache.hh"
+#include "recpacketcache.hh"
 #include <boost/tuple/tuple.hpp>
 #include <boost/optional.hpp>
@@ -22 +23 @@
 
 void primeHints(void);
-
-
 
 struct NegCacheEntry
@@ -451 +450 @@
 };
 extern __thread MemRecursorCache* t_RC;
+extern __thread RecursorPacketCache* t_packetCache;
 typedef MTasker<PacketID,string> MT_t;
 extern __thread MT_t* MT;
@@ -528 +528 @@
 uint64_t* pleaseGetConcurrentQueries();
 uint64_t* pleaseGetThrottleSize();
+uint64_t* pleaseGetPacketCacheHits();
+uint64_t* pleaseGetPacketCacheSize();
+
 #endif