kill some signed/unsigned warnings, speedup cache pruning slightly, clean up code...

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@592 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 80d4414848ae1b1af29073d68acf2971619976e6..2dde854b96cb5c618a5c487796a5625eb274d7fb 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -121,7 +121,7 @@ struct PacketID
   PacketID() : sock(0), inNeeded(0), outPos(0)
   {}
 
-  uint16_t id;  // wait for a specific id/remote paie
+  uint16_t id;  // wait for a specific id/remote pair
   struct sockaddr_in remote;  // this is the remote
 
   Socket* sock;  // or wait for an event on a TCP fd
@@ -129,7 +129,7 @@ struct PacketID
   string inMSG; // they'll go here
 
   string outMSG; // the outgoing message that needs to be sent
-  int outPos;    // how far we are along in the outMSG
+  string::size_type outPos;    // how far we are along in the outMSG
 
   bool operator<(const PacketID& b) const
   {
@@ -152,7 +152,6 @@ int asendtcp(const string& data, Socket* sock)
   pident.outMSG=data;
   string packet;
 
-  //  cerr<<"asendtcp called for "<<data.size()<<" bytes"<<endl;
   d_tcpclientwritesocks[sock->getHandle()]=pident;
 
   int ret=MT->waitEvent(pident,&packet,1);
@@ -170,8 +169,6 @@ int arecvtcp(string& data, int len, Socket* sock)
   pident.sock=sock;
   pident.inNeeded=len;
 
-  // cerr<<"arecvtcp called for "<<len<<" bytes"<<endl;
-  // cerr<<d_tcpclientwritesocks.size()<<" write sockets"<<endl;
   d_tcpclientreadsocks[sock->getHandle()]=pident;
 
   int ret=MT->waitEvent(pident,&data,1);
@@ -202,17 +199,15 @@ int arecvfrom(char *data, int len, int flags, struct sockaddr *toaddr, Utility::
     *d_len=packet.size();
     memcpy(data,packet.c_str(),min(len,*d_len));
   }
-
   return ret;
 }
 
-
 static void writePid(void)
 {
   string fname=::arg()["socket-dir"]+"/"+s_programname+".pid";
   ofstream of(fname.c_str());
   if(of)
-    of<<getpid()<<endl;
+    of<< getpid() <<endl;
   else
     L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<" failed: "<<strerror(errno)<<endl;
 }
@@ -231,7 +226,6 @@ void primeHints(void)
     nsrr.qtype=QType::NS;
     nsrr.ttl=time(0)+3600000;
     
-
     for(char c='a';c<='m';++c) {
       static char templ[40];
       strncpy(templ,"a.root-servers.net", sizeof(templ) - 1);
@@ -251,8 +245,6 @@ void primeHints(void)
     set<DNSResourceRecord> aset;
 
     while(zpt.get(rr)) {
-      //      cout<<"'"<<rr.qname<<"' "<<rr.qtype.getName()<<" '"<<rr.content<<"'\n";
-
       rr.ttl+=time(0);
       if(rr.qtype.getCode()==QType::A) {
        set<DNSResourceRecord> aset;
@@ -267,7 +259,6 @@ void primeHints(void)
   RC.replace("", QType(QType::NS), nsset); // and stuff in the cache
 }
 
-
 void startDoResolve(void *p)
 {
   try {
@@ -341,9 +332,6 @@ void startDoResolve(void *p)
        L<<Logger::Error<<"Error writing TCP answer to "<<dc->getRemote()<<": "<< (ret ? strerror(errno) : "EOF") <<endl;
       else if((unsigned int)ret != 2 + packet.size())
        L<<Logger::Error<<"Oops, partial answer sent to "<<dc->getRemote()<<" - probably would have trouble receiving our answer anyhow (size="<<packet.size()<<")"<<endl;
-
-      //      if(write(R->getSocket(),buf,2)!=2 || write(R->getSocket(),buffer,R->len)!=R->len)
-      //  XXX FIXME write this writev fallback otherwise
     }
 
     //    MT->setTitle("DONE! udp question for "+P.qdomain+"|"+P.qtype.getName());
@@ -788,7 +776,7 @@ int main(int argc, char **argv)
        else
          continue;
 
-      if(FD_ISSET(d_clientsock,&readfds)) { // do we have a question response?
+      if(FD_ISSET(d_clientsock,&readfds)) { // do we have a UDP question response?
        d_len=recvfrom(d_clientsock, data, sizeof(data), 0, (sockaddr *)&fromaddr, &addrlen);    
        if(d_len<0) 
          continue;
@@ -810,7 +798,6 @@ int main(int argc, char **argv)
        catch(MOADNSException& mde) {
          L<<Logger::Error<<"Unparseable packet from remote server "<< sockAddrToString((struct sockaddr_in*) &fromaddr, addrlen) <<": "<<mde.what()<<endl;
        }
-
       }
       
       for(vector<int>::const_iterator i=d_udpserversocks.begin(); i!=d_udpserversocks.end(); ++i) {
@@ -840,7 +827,7 @@ int main(int argc, char **argv)
       }
 
       for(tcpserversocks_t::const_iterator i=s_tcpserversocks.begin(); i!=s_tcpserversocks.end(); ++i) { 
-       if(FD_ISSET(*i ,&readfds)) { // do we have a new TCP connection
+       if(FD_ISSET(*i ,&readfds)) { // do we have a new TCP connection?
          struct sockaddr_in addr;
          socklen_t addrlen=sizeof(addr);
          int newsock=accept(*i, (struct sockaddr*)&addr, &addrlen);
@@ -857,6 +844,7 @@ int main(int argc, char **argv)
        }
       }
 
+      // have any question answers come in over TCP?
       for(map<int,PacketID>::iterator i=d_tcpclientreadsocks.begin(); i!=d_tcpclientreadsocks.end();) { 
        bool haveErased=false;
        if(FD_ISSET(i->first, &readfds)) { // can we receive
@@ -888,7 +876,8 @@ int main(int argc, char **argv)
        if(!haveErased)
          ++i;
       }
-
+      
+      // is there data we can send to remote nameservers over TCP?
       for(map<int,PacketID>::iterator i=d_tcpclientwritesocks.begin(); i!=d_tcpclientwritesocks.end(); ) { 
        bool haveErased=false;
        if(FD_ISSET(i->first, &writefds)) { // can we send over TCP
@@ -899,10 +888,9 @@ int main(int argc, char **argv)
            if(i->second.outPos==i->second.outMSG.size()) {
              // cerr<<"Sent out entire load of "<<i->second.outMSG.size()<<" bytes"<<endl;
              PacketID pid=i->second;
-             d_tcpclientwritesocks.erase((i++));
-             MT->sendEvent(pid, 0);
+             d_tcpclientwritesocks.erase(i++);   // erase!
              haveErased=true;
-             // cerr<<"Sent event too"<<endl;
+             MT->sendEvent(pid, 0);
            }
 
          }
@@ -914,8 +902,8 @@ int main(int argc, char **argv)
        if(!haveErased)
          ++i;
       }
-
-
+      
+      // very braindead TCP incoming question parser
       for(vector<TCPConnection>::iterator i=tcpconnections.begin();i!=tcpconnections.end();++i) {
        if(FD_ISSET(i->fd, &readfds)) {
          if(i->state==TCPConnection::BYTE0) {

diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index 3e49ef3f3e54049b210c7bc4642c4eed835214e5..a5185767e8b83e79ad64942ee8dd87647682673b 100644 (file)
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -157,7 +157,6 @@ void MemRecursorCache::replace(const string &qname, const QType& qt,  const set<
 
 void MemRecursorCache::doPrune(void)
 {
-  unsigned int names=0;
   uint32_t now=(uint32_t)time(0);
 
 //  cout<<"Going to prune!\n";
@@ -179,7 +178,6 @@ void MemRecursorCache::doPrune(void)
 //      cout<<"Looking at '"<<j->d_name<<"', "<<now - j->getTTD()<<" seconds overdue!\n";
     looked++;
     if(j->d_records.size()==1) {
-//      ttdindex.erase(j++);
       j++;
       quickZonk++;
       continue;
@@ -192,7 +190,6 @@ void MemRecursorCache::doPrune(void)
 
     if(ce.d_records.empty()) { // everything is gone
 //      cout<<"Zonked it entirely!\n";
-//      ttdindex.erase(j++);
       j++;
       fullZonk++;
     }
@@ -211,8 +208,8 @@ void MemRecursorCache::doPrune(void)
     }
   }
   
-//  cout<<"Walk took "<< dt.udiff()<<"usec\n";
-  dt.set();
+  //  cout<<"Walk took "<< dt.udiff()<<"usec\n";
+  //  dt.set();
   ttdindex.erase(ttdindex.begin(), j);
   //  cout<<"Erase took "<< dt.udiff()<<" usec, looked: "<<looked<<", quick: "<<quickZonk<<", full: ";
   //  cout<<fullZonk<<", partial: "<<partialZonk<<", no: "<<noZonk<<"\n";

diff --git a/pdns/recursor_cache.hh b/pdns/recursor_cache.hh
index 4582b6e56539caa31fe42fe824b38863a31ec62c..057995b96538930458688ac3b779a1204b61b6b8 100644 (file)
--- a/pdns/recursor_cache.hh
+++ b/pdns/recursor_cache.hh
@@ -52,7 +52,7 @@ private:
 
   struct predicate
   {
-    predicate(time_t limit) : d_limit(limit)
+    predicate(uint32_t limit) : d_limit(limit)
     {
     }
     
@@ -60,7 +60,7 @@ private:
     {
       return sr.d_ttd <= d_limit;
     }
-    time_t d_limit;
+    uint32_t d_limit;
   };
 
   //   typedef __gnu_cxx::hash_map<string, vector<StoredRecord> > cache_t;
@@ -74,6 +74,9 @@ private:
     records_t d_records;
     uint32_t getTTD() const
     {
+      if(d_records.size()==1)
+       return d_records.begin()->d_ttd;
+
       uint32_t earliest=numeric_limits<uint32_t>::max();
       for(records_t::const_iterator i=d_records.begin(); i != d_records.end(); ++i)
        earliest=min(earliest, i->d_ttd);