update documentation, make sure we ship sgml expander, make sure we don't always...

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

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 08c4dafb881c8a0a5b275f1a3da44e2d0ae083ad..2bd97c10e3e6a0e8ed86ec7aea22c2de0452ac3f 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,7 +1,7 @@
 AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind 
 AM_CPPFLAGS=-Ibackends/bind @THREADFLAGS@
 
-EXTRA_DIST = docs/Makefile \
+EXTRA_DIST = docs/Makefile docs/expand \
 docs/gslb-operations.sgml docs/powerdns-case.sgml docs/powerdns-install.sgml \
 docs/powerdns-overview.sgml docs/powerdns-technical.sgml  \
 docs/pdns.sgml mtasker.cc \

diff --git a/pdns/arguments.hh b/pdns/arguments.hh
index 6b77f85682a0d428f4ee5fd3222a86c58bf3e75b..1130af46b688b74a706a80488d6e0c0f924660b0 100644 (file)
--- a/pdns/arguments.hh
+++ b/pdns/arguments.hh
@@ -27,7 +27,6 @@
 #include "misc.hh"
 #include "ahuexception.hh"
 
-
 using namespace std;
 
 typedef AhuException ArgException;

diff --git a/pdns/docs/pdns.sgml b/pdns/docs/pdns.sgml
index d27240ca5b25a1ddd9f215492f5e1b2a2b1440ca..bc26a1d8577d4af7d783f7b76e15ce0cac9c2a07 100644 (file)
--- a/pdns/docs/pdns.sgml
+++ b/pdns/docs/pdns.sgml
@@ -138,7 +138,8 @@
            </listitem>
            <listitem>
              <para>
-               Cache was pruned every minute, which was too often. Now once every 5 minutes, c574.
+               Move recursor to the incredible boost::multi_index_container (c580). This brings a huge improvement
+               in cache pruning times.
              </para>
            </listitem>
            <listitem>
@@ -169,6 +170,12 @@
                in t29, fixed in c538.
              </para>
            </listitem>
+           <listitem>
+             <para>
+               Backend errors could make the whole nameserver exit under some circumstances, notably using the LDAP backend. Fixed in c583, reported in
+               t62.
+             </para>
+           </listitem>
            <listitem>
              <para>
                Referrals were subtly broken by recent CNAME/Wildcard improvements, fixed in c539. Fix and other

diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index 69ae274459f3a6bd0318ec5f7569bab44d426748..3e49ef3f3e54049b210c7bc4642c4eed835214e5 100644 (file)
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -3,11 +3,11 @@
 #include <iostream>
 #include <boost/shared_ptr.hpp>
 #include "dnsrecords.hh"
+
 using namespace std;
 using namespace boost;
 
 #include "config.h"
-#define GCC_SKIP_LOCKING
 #ifdef GCC_SKIP_LOCKING
 #include <bits/atomicity.h>
 // This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor 
@@ -152,7 +152,8 @@ void MemRecursorCache::replace(const string &qname, const QType& qt,  const set<
 
   d_cache.replace(stored, ce);
 }
-  
+
+
 
 void MemRecursorCache::doPrune(void)
 {
@@ -213,8 +214,8 @@ void MemRecursorCache::doPrune(void)
 //  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";
+  //  cout<<"Erase took "<< dt.udiff()<<" usec, looked: "<<looked<<", quick: "<<quickZonk<<", full: ";
+  //  cout<<fullZonk<<", partial: "<<partialZonk<<", no: "<<noZonk<<"\n";
   //  cache_t(d_cache).swap(d_cache);
 }
 

diff --git a/pdns/recursor_cache.hh b/pdns/recursor_cache.hh
index 6ba11fb9234d272ff989c42ad76ced7fe0213241..13610776b4d20265f87c0c8dda867542e9f8eb95 100644 (file)
--- a/pdns/recursor_cache.hh
+++ b/pdns/recursor_cache.hh
@@ -16,6 +16,7 @@
 using namespace boost;
 using namespace ::boost::multi_index;
 
+
 class MemRecursorCache : public boost::noncopyable //  : public RecursorCache
 {
 public:
@@ -42,6 +43,7 @@ private:
     {
       return 4+d_string.size();
     }
+
   };
 
   struct predicate
@@ -60,6 +62,7 @@ private:
   //   typedef __gnu_cxx::hash_map<string, vector<StoredRecord> > cache_t;
   struct CacheEntry
   {
+    CacheEntry(){}
     CacheEntry(const string& name, const vector<StoredRecord>& records) : d_name(name), d_records(records)
     {}
     string d_name;
@@ -72,6 +75,7 @@ private:
        earliest=min(earliest, i->d_ttd);
       return earliest;
     }
+
   };
 
   typedef multi_index_container<
@@ -82,9 +86,9 @@ private:
                >
   > cache_t;
 
-
 private:
   cache_t d_cache;
+
 };