Changeset 1284

Timestamp:

11/15/08 23:24:17 (16 months ago)

Author:

ahu

Message:

make statbag work with unsigned counters - people are complaining of wraparounds at 2.15 billion packets going wrong! closes ticket 179, thanks Stefan Schmidt

Location:

trunk/pdns/pdns

Files:

• common_startup.cc (modified) (2 diffs)
• dnsproxy.hh (modified) (1 diff)
• packetcache.cc (modified) (10 diffs)
• packetcache.hh (modified) (1 diff)
• statbag.cc (modified) (5 diffs)
• statbag.hh (modified) (2 diffs)
• ueberbackend.cc (modified) (1 diff)

trunk/pdns/pdns/common_startup.cc

@@ -182 +182 @@
 void sendout(const DNSDistributor::AnswerData &AD)
 {
-  static int &numanswered=*S.getPointer("udp-answers");
-  static int &numanswered4=*S.getPointer("udp4-answers");
-  static int &numanswered6=*S.getPointer("udp6-answers");
+  static unsigned int &numanswered=*S.getPointer("udp-answers");
+  static unsigned int &numanswered4=*S.getPointer("udp4-answers");
+  static unsigned int &numanswered6=*S.getPointer("udp6-answers");
 
   if(!AD.A)
@@ -214 +214 @@
   DNSPacket cached;
 
-  int &numreceived=*S.getPointer("udp-queries");
-  int &numanswered=*S.getPointer("udp-answers");
-
-  int &numreceived4=*S.getPointer("udp4-queries");
-  int &numanswered4=*S.getPointer("udp4-answers");
-
-  int &numreceived6=*S.getPointer("udp6-queries");
-  int &numanswered6=*S.getPointer("udp6-answers");
+  unsigned int &numreceived=*S.getPointer("udp-queries");
+  unsigned int &numanswered=*S.getPointer("udp-answers");
+
+  unsigned int &numreceived4=*S.getPointer("udp4-queries");
+  unsigned int &numanswered4=*S.getPointer("udp4-answers");
+
+  unsigned int &numreceived6=*S.getPointer("udp6-queries");
+  unsigned int &numanswered6=*S.getPointer("udp6-answers");
   numreceived=-1;
   int diff;

trunk/pdns/pdns/dnsproxy.hh

@@ -68 +68 @@
   NetmaskGroup d_ng;
   int d_sock;
-  int* d_resanswers;
-  int* d_udpanswers;
-  int* d_resquestions;
+  unsigned int* d_resanswers;
+  unsigned int* d_udpanswers;
+  unsigned int* d_resquestions;
   pthread_mutex_t d_lock;
   uint16_t d_xor;

trunk/pdns/pdns/packetcache.cc

@@ -38 +38 @@
   S.declare("packetcache-size");
 
-  statnumhit=S.getPointer("packetcache-hit");
-  statnummiss=S.getPointer("packetcache-miss");
-  statnumentries=S.getPointer("packetcache-size");
+  d_statnumhit=S.getPointer("packetcache-hit");
+  d_statnummiss=S.getPointer("packetcache-miss");
+  d_statnumentries=S.getPointer("packetcache-size");
 }
 
@@ -55 +55 @@
   if(d_doRecursion && p->d.rd) { // wants recursion
     if(!d_recursivettl) {
-      (*statnummiss)++;
+      (*d_statnummiss)++;
       d_miss++;
       return 0;
@@ -62 +62 @@
   else { // does not
     if(!d_ttl) {
-      (*statnummiss)++;
+      (*d_statnummiss)++;
       d_miss++;
       return 0;
@@ -81 +81 @@
 
     if(!((d_hit+d_miss)%30000)) {
-      *statnumentries=d_map.size(); // needs lock
+      *d_statnumentries=d_map.size(); // needs lock
     }
     string value;
@@ -87 +87 @@
     if(getEntry(p->qdomain, p->qtype, PacketCache::PACKETCACHE, value, -1, packetMeritsRecursion)) {
       //      cerr<<"Packet cache hit!"<<endl;
-      (*statnumhit)++;
+      (*d_statnumhit)++;
       d_hit++;
       if(cached->parse(value.c_str(), value.size()) < 0) {
@@ -97 +97 @@
   }
   //   cerr<<"Packet cache miss"<<endl;
-  (*statnummiss)++;
+  (*d_statnummiss)++;
   d_miss++;
   return 0; // bummer
@@ -164 +164 @@
     delcount = d_map.size();
     d_map.clear();
-    *statnumentries=0;
+    *d_statnumentries=0;
     return delcount;
   }
@@ -239 +239 @@
     }
   }
-  *statnumentries=d_map.size();
+  *d_statnumentries=d_map.size();
   return delcount;
 }
@@ -283 +283 @@
   WriteLock l(&d_mut);
 
-  *statnumentries=d_map.size();
+  *d_statnumentries=d_map.size();
 
   unsigned int maxCached=::arg().asNum("max-cache-entries");
   unsigned int toTrim=0;
   
-  unsigned int cacheSize=*statnumentries;
+  unsigned int cacheSize=*d_statnumentries;
 
   if(maxCached && cacheSize > maxCached) {
@@ -325 +325 @@
   }
   //  cerr<<"erased: "<<erased<<endl;
-  *statnumentries=d_map.size();
+  *d_statnumentries=d_map.size();
   DLOG(L<<"Done with cache clean"<<endl);
 }

trunk/pdns/pdns/packetcache.hh

@@ -125 +125 @@
   int d_recursivettl;
   bool d_doRecursion;
-  int *statnumhit;
-  int *statnummiss;
-  int *statnumentries;
+  unsigned int *d_statnumhit;
+  unsigned int *d_statnummiss;
+  unsigned int *d_statnumentries;
 };
 

trunk/pdns/pdns/statbag.cc

@@ -52 +52 @@
   ostringstream o;
   lock();
-  for(map<string,int *>::const_iterator i=d_stats.begin();
+  for(map<string, unsigned int *>::const_iterator i=d_stats.begin();
       i!=d_stats.end();
       i++)
@@ -68 +68 @@
   vector<string> ret;
   lock();
-  for(map<string,int *>::const_iterator i=d_stats.begin();
+  for(map<string, unsigned int *>::const_iterator i=d_stats.begin();
       i!=d_stats.end();
       i++)
@@ -89 +89 @@
 {
   lock();
-  int *i=new int(0);
+  unsigned int *i=new unsigned int(0);
   d_stats[key]=i;
   d_keyDescrips[key]=descrip;
@@ -158 +158 @@
 }
 
-int *StatBag::getPointer(const string &key)
+unsigned int *StatBag::getPointer(const string &key)
 {
   exists(key);
@@ -166 +166 @@
 StatBag::~StatBag()
 {
-  for(map<string,int *>::const_iterator i=d_stats.begin();
+  for(map<string,unsigned int *>::const_iterator i=d_stats.begin();
       i!=d_stats.end();
       i++)

trunk/pdns/pdns/statbag.hh

@@ -59 +59 @@
 class StatBag
 {
-  map<string,int *> d_stats;
+  map<string, unsigned int *> d_stats;
   map<string, string> d_keyDescrips;
   map<string,StatRing>d_rings;
@@ -97 +97 @@
   int read(const string &key); //!< read the value behind this key
   int readZero(const string &key); //!< read the value behind this key, and zero it afterwards
-  int *getPointer(const string &key); //!< get a direct pointer to the value behind a key. Use this for high performance increments
+  unsigned int *getPointer(const string &key); //!< get a direct pointer to the value behind a key. Use this for high performance increments
   string getValueStr(const string &key); //!< read a value behind a key, and return it as a string
   string getValueStrZero(const string &key); //!< read a value behind a key, and return it as a string, and zero afterwards

trunk/pdns/pdns/ueberbackend.cc

@@ -238 +238 @@
 {
   extern PacketCache PC;
-  static int *qcachehit=S.getPointer("query-cache-hit");
-  static int *qcachemiss=S.getPointer("query-cache-miss");
+  static unsigned int *qcachehit=S.getPointer("query-cache-hit");
+  static unsigned int *qcachemiss=S.getPointer("query-cache-miss");
 
   static int negqueryttl=::arg().asNum("negquery-cache-ttl");