Changeset 1496

Timestamp:

01/10/10 09:30:52 (2 months ago)

Author:

ahu

Message:

implement 'rec_control get-all' to get all stats, plus remove dead 'shunt' statistics

Location:

trunk/pdns/pdns

Files:

• rec_channel_rec.cc (modified) (5 diffs)
• syncres.hh (modified) (1 diff)

trunk/pdns/pdns/rec_channel_rec.cc

@@ -12 +12 @@
 #include <boost/format.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -56 +57 @@
 }
 
+string getAllStats()
+{
+  string ret;
+  pair<string, const uint32_t*> the32bits;
+  pair<string, const uint64_t*> the64bits;
+  pair<string, function< uint32_t() > >  the32bitmembers;
+  BOOST_FOREACH(the32bits, d_get32bitpointers) {
+    ret += the32bits.first + "\t" + lexical_cast<string>(*the32bits.second) + "\n";
+  }
+  BOOST_FOREACH(the64bits, d_get64bitpointers) {
+    ret += the64bits.first + "\t" + lexical_cast<string>(*the64bits.second) + "\n";
+  }
+  BOOST_FOREACH(the32bitmembers, d_get32bitmembers) {
+    ret += the32bitmembers.first + "\t" + lexical_cast<string>(the32bitmembers.second()) + "\n";
+  }
+  return ret;
+}
 
 template<typename T>
@@ -156 +174 @@
 }
 
-
-#if 0  // broken!
-uint32_t getQueryRate()
-{
-  struct timeval now;
-  gettimeofday(&now, 0);
-  optional<float> delay=g_stats.queryrate.get(now, 10);
-  if(delay)
-    return (uint32_t)(1000000/(*delay));
-  else
-    return 0;
-}
-#endif 
-
 #ifndef WIN32
 static uint64_t getSysTimeMsec()
@@ -365 +369 @@
   addGetStat("dlg-only-drops", &SyncRes::s_nodelegated);
   
-  addGetStat("shunted-queries", &g_stats.shunted);
-  addGetStat("noshunt-size", &g_stats.noShuntSize);
-  addGetStat("noshunt-expired", &g_stats.noShuntExpired);
-  addGetStat("noshunt-nomatch", &g_stats.noShuntNoMatch);
-  addGetStat("noshunt-cname", &g_stats.noShuntCNAME);
-  addGetStat("noshunt-wrong-question", &g_stats.noShuntWrongQuestion);
-  addGetStat("noshunt-wrong-type", &g_stats.noShuntWrongType);
-
   addGetStat("negcache-entries", boost::bind(getNegCacheSize));
   addGetStat("throttle-entries", boost::bind(getThrottleSize)); 
@@ -475 +471 @@
   vector<string>::const_iterator begin=words.begin()+1, end=words.end();
 
+  if(cmd=="get-all")
+    return getAllStats();
+
   if(cmd=="get") 
     return doGet(begin, end);
-
+  
   if(cmd=="get-parameter") 
     return doGetParameter(begin, end);

trunk/pdns/pdns/syncres.hh

@@ -475 +475 @@
   uint64_t chainResends;
   uint64_t nsSetInvalidations;
-  uint64_t shunted;
-  uint64_t noShuntCNAME, noShuntExpired, noShuntSize, noShuntNoMatch, noShuntWrongType, noShuntWrongQuestion;
   uint64_t ednsPingMatches;
   uint64_t ednsPingMismatches;