Changeset 1507

Timestamp:

02/06/10 13:20:31 (3 years ago)

Author:

ahu

Message:

do far more frequent cache cleaning, and less 'cache scanning'. Thanks to Winfried Angele for experimenting with best settings.
scale caches with number of threads - so '1000000' cache entries and 4 threads will give you 250000 entries per thread

Location:

trunk/pdns/pdns

Files:

• pdns_recursor.cc (modified) (5 diffs)
• recursor_cache.cc (modified) (3 diffs)
• syncres.hh (modified) (1 diff)

trunk/pdns/pdns/pdns_recursor.cc

@@ -113 +113 @@
 __thread MT_t* MT; // the big MTasker
 
+unsigned int g_numThreads;
+
 #define LOCAL_NETS "127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12, ::1/128, fe80::/10"
 
@@ -1057 +1059 @@
   Utility::gettimeofday(&now, 0);
 
-  if(now.tv_sec - last_prune > (time_t)(300 + 3*t_id)) { 
+  if(now.tv_sec - last_prune > (time_t)(5 + t_id)) { 
     DTime dt;
     dt.setTimeval(now);
     t_RC->doPrune(); // this function is local to a thread, so fine anyhow
-    t_packetCache->doPruneTo(::arg().asNum("max-packetcache-entries"));
+    t_packetCache->doPruneTo(::arg().asNum("max-packetcache-entries") / g_numThreads);
     
     typedef SyncRes::negcache_t::nth_index<1>::type negcache_by_ttd_index_t;
@@ -1108 +1110 @@
 void makeThreadPipes()
 {
-  int numThreads = ::arg().asNum("threads");
-  for(int n=0; n < numThreads; ++n) {
+  for(unsigned int n=0; n < g_numThreads; ++n) {
     struct ThreadPipeSet tps;
     int fd[2];
@@ -1655 +1656 @@
   g_maxMThreads=::arg().asNum("max-mthreads");
   
-  int numThreads = ::arg().asNum("threads");
-  if(numThreads == 1) {
+  g_numThreads = ::arg().asNum("threads");
+  if(g_numThreads == 1) {
     L<<Logger::Warning<<"Operating unthreaded"<<endl;
     recursorThread(0);
@@ -1662 +1663 @@
   else {
     pthread_t tid;
-    L<<Logger::Warning<<"Launching "<< numThreads <<" threads"<<endl;
-    for(int n=0; n < numThreads; ++n) {
+    L<<Logger::Warning<<"Launching "<< g_numThreads <<" threads"<<endl;
+    for(unsigned int n=0; n < g_numThreads; ++n) {
       pthread_create(&tid, 0, recursorThread, (void*)n);
     }

trunk/pdns/pdns/recursor_cache.cc

@@ -359 +359 @@
   d_cachecachevalid=false;
 
-  unsigned int maxCached=::arg().asNum("max-cache-entries");
+  unsigned int maxCached=::arg().asNum("max-cache-entries") / g_numThreads;
   unsigned int toTrim=0;
   
@@ -367 +367 @@
     toTrim = cacheSize - maxCached;
   }
-
+  
   //  cout<<"Need to trim "<<toTrim<<" from cache to meet target!\n";
 
@@ -375 +375 @@
   unsigned int tried=0, lookAt, erased=0;
 
-  // two modes - if toTrim is 0, just look through 10000 records and nuke everything that is expired
+  // two modes - if toTrim is 0, just look through 0.1% of all records and nuke everything that is expired
   // otherwise, scan first 5*toTrim records, and stop once we've nuked enough
   if(toTrim)
     lookAt=5*toTrim;
   else
-    lookAt=cacheSize/10;
-
+    lookAt=cacheSize/1000;
 
   sequence_t::iterator iter=sidx.begin(), eiter;

trunk/pdns/pdns/syncres.hh

@@ -497 +497 @@
 void parseACLs();
 extern RecursorStats g_stats;
-
+extern unsigned int g_numThreads;
 
 template<typename Index>