Changeset 1510

Timestamp:

02/06/10 19:29:45 (3 years ago)

Author:

ahu

Message:

fix dump-cache for the new pimped world

Location:

trunk/pdns/pdns

Files:

• rec_channel_rec.cc (modified) (2 diffs)
• recursor_cache.cc (modified) (2 diffs)
• recursor_cache.hh (modified) (1 diff)

trunk/pdns/pdns/rec_channel_rec.cc

@@ -111 +111 @@
 
 
+static uint64_t* pleaseDump(int fd)
+{
+  return new uint64_t(t_RC->doDump(fd));
+}
+
 template<typename T>
 string doDumpCache(T begin, T end)
@@ -123 +128 @@
   if(fd < 0) 
     return "Error opening dump file for writing: "+string(strerror(errno))+"\n";
-
-  t_RC->doDumpAndClose(fd); // RC MULTI FIXME
-
-  return "done\n";
+  uint64_t total = 0;
+  try {
+    total = broadcastAccFunction<uint64_t>(boost::bind(pleaseDump, fd));
+  }
+  catch(...){}
+  
+  close(fd);
+  return "dumped "+lexical_cast<string>(total)+" records\n";
 }
 

trunk/pdns/pdns/recursor_cache.cc

@@ -328 +328 @@
 
 
-void MemRecursorCache::doDumpAndClose(int fd)
-{
-  FILE* fp=fdopen(fd, "w");
-  if(!fp) {
-    close(fd);
-    return;
-  }
-
+uint64_t MemRecursorCache::doDump(int fd)
+{
+  FILE* fp=fdopen(dup(fd), "w");
+  if(!fp) { // dup probably failed
+    return 0;
+  }
+  fprintf(fp, "; dump from thread follows\n;\n");
   typedef cache_t::nth_index<1>::type sequence_t;
   sequence_t& sidx=d_cache.get<1>();
 
+  uint64_t count=0;
   time_t now=time(0);
   for(sequence_t::const_iterator i=sidx.begin(); i != sidx.end(); ++i) {
     for(vector<StoredRecord>::const_iterator j=i->d_records.begin(); j != i->d_records.end(); ++j) {
+      count++;
       try {
         DNSResourceRecord rr=String2DNSRR(i->d_qname, QType(i->d_qtype), j->d_string, j->d_ttd - now);
@@ -352 +353 @@
   }
   fclose(fp);
+  return count;
 }
 

trunk/pdns/pdns/recursor_cache.hh

@@ -38 +38 @@
   void doPrune(void);
   void doSlash(int perc);
-  void doDumpAndClose(int fd);
+  uint64_t doDump(int fd);
   int doWipeCache(const string& name, uint16_t qtype=0xffff);
   bool doAgeCache(time_t now, const string& name, uint16_t qtype, int32_t newTTL);