Changeset 469

Timestamp:

09/02/05 16:53:40 (8 years ago)

Author:

ahu

Message:

remove quite a number of gettimeofday calls

Location:

trunk/pdns/pdns

Files:

• pdns_recursor.cc (modified) (1 diff)
• syncres.cc (modified) (15 diffs)
• syncres.hh (modified) (6 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -483 +483 @@
 };
 
+#if 0
+
+#include <execinfo.h>
+
+static void maketrace()
+{
+  void *array[20]; //only care about last 17 functions (3 taken with tracing support)
+  size_t size;
+  char **strings;
+  size_t i;
+
+  size = backtrace (array, 20);
+  strings = backtrace_symbols (array, size); //Need -rdynamic gcc (linker) flag for this to work
+
+  for (i = 0; i < size; i++) //skip useless functions
+    cout<<strings[i]<<"\n";
+  cout<<"--"<<endl;
+}
+
+extern "C" {
+int gettimeofday (struct timeval *__restrict __tv,
+                  __timezone_ptr_t __tz)
+{
+  maketrace();
+  return 0;
+}
+
+}
+#endif 
+
 int main(int argc, char **argv) 
 {

trunk/pdns/pdns/syncres.cc

@@ -118 +118 @@
     LOG<<prefix<<qname<<": Checking if we have NS in cache for '"<<subdomain<<"'"<<endl;
     set<DNSResourceRecord>ns;
-    if(RC.get(d_now, subdomain,QType(QType::NS),&ns)>0) {
+    if(RC.get(d_now.tv_sec, subdomain,QType(QType::NS),&ns)>0) {
 
       for(set<DNSResourceRecord>::const_iterator k=ns.begin();k!=ns.end();++k) {
-        if(k->ttl > (unsigned int)d_now ) { 
+        if(k->ttl > (unsigned int)d_now.tv_sec ) { 
           set<DNSResourceRecord>aset;
-          if(!endsOn(k->content,subdomain) || RC.get(d_now, k->content,QType(QType::A),&aset) > 5) {
+          if(!endsOn(k->content,subdomain) || RC.get(d_now.tv_sec, k->content,QType(QType::A),&aset) > 5) {
             bestns.insert(*k);
             LOG<<prefix<<qname<<": NS (with ip, or non-glue) in cache for '"<<subdomain<<"' -> '"<<k->content<<"'"<<endl;
             LOG<<prefix<<qname<<": within bailiwick: "<<endsOn(k->content,subdomain);
             if(!aset.empty())
-              L<<", in cache, ttl="<<(unsigned int)(((time_t)aset.begin()->ttl- d_now ))<<endl;
+              L<<", in cache, ttl="<<(unsigned int)(((time_t)aset.begin()->ttl- d_now.tv_sec ))<<endl;
             else
               L<<", not in cache"<<endl;
@@ -184 +184 @@
   LOG<<prefix<<qname<<": Looking for CNAME cache hit of '"<<tuple<<"'"<<endl;
   set<DNSResourceRecord> cset;
-  if(RC.get(d_now, qname,QType(QType::CNAME),&cset) > 0) {
+  if(RC.get(d_now.tv_sec, qname,QType(QType::CNAME),&cset) > 0) {
 
     for(set<DNSResourceRecord>::const_iterator j=cset.begin();j!=cset.end();++j) {
-      if(j->ttl>(unsigned int) d_now) {
+      if(j->ttl>(unsigned int) d_now.tv_sec) {
         LOG<<prefix<<qname<<": Found cache CNAME hit for '"<<tuple<<"' to '"<<j->content<<"'"<<endl;    
         DNSResourceRecord rr=*j;
-        rr.ttl-=d_now;
+        rr.ttl-=d_now.tv_sec;
         ret.push_back(rr);
         if(!(qtype==QType(QType::CNAME))) {// perhaps they really wanted a CNAME!
@@ -220 +220 @@
     res=0;
     map<string,NegCacheEntry>::const_iterator ni=s_negcache.find(toLower(qname));
-    if(d_now < ni->second.ttd) {
-      sttl=ni->second.ttd - d_now;
+    if(d_now.tv_sec < ni->second.ttd) {
+      sttl=ni->second.ttd - d_now.tv_sec;
       LOG<<prefix<<qname<<": Entire record '"<<toLower(qname)<<"', is negatively cached for another "<<sttl<<" seconds"<<endl;
       res=RCode::NXDomain; 
@@ -242 +242 @@
     map<string,NegCacheEntry>::const_iterator ni=s_negcache.find(tuple);
     if(ni!=s_negcache.end()) {
-      if(d_now < ni->second.ttd) {
-        sttl=ni->second.ttd - d_now;
+      if(d_now.tv_sec < ni->second.ttd) {
+        sttl=ni->second.ttd - d_now.tv_sec;
         LOG<<prefix<<qname<<": "<<qtype.getName()<<" is negatively cached for another "<<sttl<<" seconds"<<endl;
         res=RCode::NoError; // only this record doesn't exist
@@ -259 +259 @@
   set<DNSResourceRecord> cset;
   bool found=false, expired=false;
-  if(RC.get(d_now, sqname,sqt,&cset)>0) {
+  if(RC.get(d_now.tv_sec, sqname,sqt,&cset)>0) {
     LOG<<prefix<<qname<<": Found cache hit for "<<sqt.getName()<<": ";
     for(set<DNSResourceRecord>::const_iterator j=cset.begin();j!=cset.end();++j) {
       LOG<<j->content;
-      if(j->ttl>(unsigned int) d_now) {
+      if(j->ttl>(unsigned int) d_now.tv_sec) {
         DNSResourceRecord rr=*j;
-        rr.ttl-=d_now;
+        rr.ttl-=d_now.tv_sec;
         if(giveNegative) {
           rr.d_place=DNSResourceRecord::AUTHORITY;
@@ -322 +322 @@
   for(set<string>::const_iterator i=nameservers.begin();i!=nameservers.end();++i) {
     rnameservers.push_back(*i);
-    speeds[*i]=nsSpeeds[toLower(*i)].get();
+    DecayingEwma& temp=nsSpeeds[toLower(*i)];
+    speeds[*i]=temp.get(&d_now);
   }
   random_shuffle(rnameservers.begin(),rnameservers.end());
@@ -339 +340 @@
     L<<endl;
   }
-
   return rnameservers;
 }
@@ -378 +378 @@
       bool doTCP=false;
 
-      if(s_throttle.shouldThrottle(d_now, remoteIP+"|"+qname+"|"+qtype.getName())) {
+      if(s_throttle.shouldThrottle(d_now.tv_sec, remoteIP+"|"+qname+"|"+qtype.getName())) {
         LOG<<prefix<<qname<<": query throttled "<<endl;
         s_throttledqueries++;
@@ -403 +403 @@
             LOG<<prefix<<qname<<": error resolving"<<endl;
 
-          nsSpeeds[toLower(*tns)].submit(1000000); // 1 sec
+          nsSpeeds[toLower(*tns)].submit(1000000, &d_now); // 1 sec
           
-          s_throttle.throttle(d_now, remoteIP+"|"+qname+"|"+qtype.getName(),20,5);
+          s_throttle.throttle(d_now.tv_sec, remoteIP+"|"+qname+"|"+qtype.getName(),20,5);
           continue;
         }
-        d_now=time(0);
+        gettimeofday(&d_now, 0);
       }
 
@@ -425 +425 @@
       if(d_lwr.d_rcode==RCode::ServFail) {
         LOG<<prefix<<qname<<": "<<*tns<<" returned a ServFail, trying sibling NS"<<endl;
-        s_throttle.throttle(d_now,remoteIP+"|"+qname+"|"+qtype.getName(),60,3);
+        s_throttle.throttle(d_now.tv_sec,remoteIP+"|"+qname+"|"+qtype.getName(),60,3);
         continue;
       }
@@ -452 +452 @@
             DNSResourceRecord rr=*i;
             rr.d_place=DNSResourceRecord::ANSWER;
-            rr.ttl+=d_now;
+            rr.ttl+=d_now.tv_sec;
             //    rr.ttl=time(0)+10+10*rr.qtype.getCode();
             tcache[toLower(i->qname)+"|"+i->qtype.getName()].insert(rr);
@@ -489 +489 @@
           NegCacheEntry ne;
           ne.name=i->qname;
-          ne.ttd=d_now + i->ttl;
+          ne.ttd=d_now.tv_sec + i->ttl;
           s_negcache[toLower(qname)]=ne;
           negindic=true;
@@ -528 +528 @@
           NegCacheEntry ne;
           ne.name=i->qname;
-          ne.ttd=d_now + i->ttl;
+          ne.ttd=d_now.tv_sec + i->ttl;
           s_negcache[toLower(qname)+"|"+qtype.getName()]=ne;
           negindic=true;
@@ -560 +560 @@
       else {
         LOG<<prefix<<qname<<": status=NS "<<*tns<<" is lame for '"<<auth<<"', trying sibling NS"<<endl;
-        s_throttle.throttle(d_now, remoteIP+"|"+qname+"|"+qtype.getName(),60,0);
+        s_throttle.throttle(d_now.tv_sec, remoteIP+"|"+qname+"|"+qtype.getName(),60,0);
       }
     }
@@ -607 +607 @@
     DNSResourceRecord ns=*k;
     ns.d_place=DNSResourceRecord::AUTHORITY;
-    ns.ttl-=d_now;
+    ns.ttl-=d_now.tv_sec;
     ret.push_back(ns);
   }

trunk/pdns/pdns/syncres.hh

@@ -12 +12 @@
 #include "misc.hh"
 #include "lwres.hh"
-
+#include <boost/utility.hpp>
 
 /* external functions, opaque to us */
@@ -88 +88 @@
 {
 public:
-  DecayingEwma() : d_last(getTime()) , d_lastget(time(0)),  d_val(0.0) {
-  }
-  void submit(int val) 
-  {
-    double now=getTime();
+  DecayingEwma() : d_last(getTime()) , d_lastget(d_last),  d_val(0.0) {
+
+  }
+
+  DecayingEwma(const DecayingEwma& orig) : d_last(orig.d_last), d_lastget(orig.d_lastget), d_val(orig.d_val)
+  {
+
+  }
+
+  void submit(int val, struct timeval*tv = 0)
+  {
+    double now;
+    if(tv)
+      now=tv->tv_sec + tv->tv_usec/1000000.0;
+    else
+      now=getTime();
+
     double diff=d_last-now;
     d_last=now;
@@ -98 +110 @@
     d_val=(1-factor)*val+ factor*d_val; 
   }
-  double get()
-  {
-    double now=getTime();
+
+  double get(struct timeval*tv = 0)
+  {
+    double now;
+    if(tv)
+      now=tv->tv_sec + tv->tv_usec/1000000.0;
+    else
+      now=getTime();
+
     double diff=d_lastget-now;
     d_lastget=now;
@@ -108 +126 @@
 
 private:
-
+  DecayingEwma& operator=(const DecayingEwma&);
   double d_last;
   double d_lastget;
@@ -118 +136 @@
 {
 public:
-  SyncRes() : d_outqueries(0), d_tcpoutqueries(0), d_throttledqueries(0), d_timeouts(0), d_cacheonly(false), d_nocache(false), d_now(time(0)) {}
+  SyncRes() : d_outqueries(0), d_tcpoutqueries(0), d_throttledqueries(0), d_timeouts(0), d_cacheonly(false), d_nocache(false) { gettimeofday(&d_now, 0); }
   int beginResolve(const string &qname, const QType &qtype, vector<DNSResourceRecord>&ret);
   void setId(int id)
@@ -172 +190 @@
   bool d_nocache;
   LWRes d_lwr;
-  time_t d_now;
+  struct timeval d_now;
 
   struct GetBestNSAnswer