Changeset 1484

Timestamp:

01/02/10 20:30:14 (8 months ago)

Author:

ahu

Message:

remove last traces of locking in recursor cache, plus reinstate cache aging, plus properly zero counters

Location:

trunk/pdns/pdns

Files:

• recursor_cache.cc (modified) (10 diffs)
• recursor_cache.hh (modified) (2 diffs)

trunk/pdns/pdns/recursor_cache.cc

@@ -6 +6 @@
 #include "arguments.hh"
 #include "syncres.hh"
-#include "lock.hh"
 #include "recursor_cache.hh"
 
@@ -106 +105 @@
 {
   unsigned int ttd=0;
-  {
-    WriteLock wl(&d_rwlock);
-    //  cerr<<"looking up "<< qname+"|"+qt.getName()<<"\n";
-
-    if(!d_cachecachevalid || !pdns_iequals(d_cachedqname, qname)) {
-      //    cerr<<"had cache cache miss"<<endl;
-      d_cachedqname=qname;
-      d_cachecache=d_cache.equal_range(tie(qname));
-      d_cachecachevalid=true;
-    }
-    else
-      //    cerr<<"had cache cache hit!"<<endl;
-      ;
-  }
-  ReadLock l(&d_rwlock);
+  //  cerr<<"looking up "<< qname+"|"+qt.getName()<<"\n";
+
+  if(!d_cachecachevalid || !pdns_iequals(d_cachedqname, qname)) {
+    //    cerr<<"had cache cache miss"<<endl;
+    d_cachedqname=qname;
+    d_cachecache=d_cache.equal_range(tie(qname));
+    d_cachecachevalid=true;
+  }
+  else
+    //    cerr<<"had cache cache hit!"<<endl;
+    ;
 
   if(res)
@@ -131 +126 @@
          ) {
         typedef cache_t::nth_index<1>::type sequence_t;
-        //      sequence_t& sidx=d_cache.get<1>();
+        sequence_t& sidx=d_cache.get<1>();
         sequence_t::iterator si=d_cache.project<1>(i);
         
@@ -144 +139 @@
         }
         if(res) {
-
-
-#if 0 // XXX FIXME removed because of threading - sidx should not be touched holding just a readlock!
           if(res->empty())
             sidx.relocate(sidx.begin(), si); 
           else
             sidx.relocate(sidx.end(), si); 
-#endif
         }
         if(qt.getCode()!=QType::ANY && qt.getCode()!=QType::ADDR) // normally if we have a hit, we are done
@@ -167 +158 @@
 bool MemRecursorCache::attemptToRefreshNSTTL(const QType& qt, const set<DNSResourceRecord>& content, const CacheEntry& stored)
 {
-  //  WriteLock wl(&d_rwlock); (holds the lock already)
   if(!stored.d_auth) {
 //    cerr<<"feel free to scribble non-auth data!"<<endl;
@@ -199 +189 @@
 void MemRecursorCache::replace(time_t now, const string &qname, const QType& qt,  const set<DNSResourceRecord>& content, bool auth)
 {
-  WriteLock wl(&d_rwlock);
   d_cachecachevalid=false;
   tuple<string, uint16_t> key=make_tuple(qname, qt.getCode());
@@ -296 +285 @@
 int MemRecursorCache::doWipeCache(const string& name, uint16_t qtype)
 {
-  WriteLock wl(&d_rwlock);
   int count=0;
   d_cachecachevalid=false;
@@ -314 +302 @@
 bool MemRecursorCache::doAgeCache(time_t now, const string& name, uint16_t qtype, int32_t newTTL)
 {
-  WriteLock wl(&d_rwlock);
   cache_t::iterator iter = d_cache.find(tie(name, qtype));
   if(iter == d_cache.end()) 
@@ -343 +330 @@
 void MemRecursorCache::doDumpAndClose(int fd)
 {
-  WriteLock wl(&d_rwlock);
   FILE* fp=fdopen(fd, "w");
   if(!fp) {
@@ -375 +361 @@
 void MemRecursorCache::doPrune(void)
 {
-  WriteLock wl(&d_rwlock);
   uint32_t now=(uint32_t)time(0);
   d_cachecachevalid=false;

trunk/pdns/pdns/recursor_cache.hh

@@ -29 +29 @@
   MemRecursorCache() : d_followRFC2181(false), d_cachecachevalid(false)
   {
-    pthread_rwlock_init(&d_rwlock, 0);
-    //    cerr<<"ce: "<<sizeof(CacheEntry)<<", sr: "<<sizeof(struct StoredRecord)<<endl;
+    cacheHits = cacheMisses = 0;
   }
   unsigned int size();
@@ -110 +109 @@
   bool d_cachecachevalid;
   bool attemptToRefreshNSTTL(const QType& qt, const set<DNSResourceRecord>& content, const CacheEntry& stored);
-
-  pthread_rwlock_t d_rwlock;
-  // boost::shared_mutex d_smutex;
 };
 string DNSRR2String(const DNSResourceRecord& rr);