Changeset 1511

Timestamp:

02/06/10 20:53:47 (3 years ago)

Author:

ahu

Message:

reinstate top-remotes

Location:

trunk/pdns/pdns

Files:

• pdns_recursor.cc (modified) (7 diffs)
• rec_channel_rec.cc (modified) (2 diffs)
• syncres.hh (modified) (3 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -75 +75 @@
 bool g_logCommonErrors;
 __thread shared_ptr<PowerDNSLua>* t_pdl;
+__thread RemoteKeeper* t_remotes;
 
 RecursorControlChannel s_rcc; // only active in thread 0
@@ -759 +760 @@
     }
 
-    g_stats.addRemote(addr);
+    t_remotes->addRemote(addr);
     if(t_allowFrom && !t_allowFrom->match(&addr)) {
       if(!g_quiet) 
@@ -800 +801 @@
   if((len=recvfrom(fd, data, sizeof(data), 0, (sockaddr *)&fromaddr, &addrlen)) >= 0) {
 
-    g_stats.addRemote(fromaddr);
+    t_remotes->addRemote(fromaddr);
 
     if(t_allowFrom && !t_allowFrom->match(&fromaddr)) {
@@ -1176 +1177 @@
 }
 
+vector<ComboAddress>& operator+=(vector<ComboAddress>&a, const vector<ComboAddress>& b)
+{
+  a.insert(a.end(), b.begin(), b.end());
+  return a;
+}
+
+
+
 template<class T> T broadcastAccFunction(const boost::function<T*()>& func, bool skipSelf)
 {
@@ -1213 +1222 @@
 template string broadcastAccFunction(const boost::function<string*()>& fun, bool skipSelf); // explicit instantiation
 template uint64_t broadcastAccFunction(const boost::function<uint64_t*()>& fun, bool skipSelf); // explicit instantiation
+template vector<ComboAddress> broadcastAccFunction(const boost::function<vector<ComboAddress> *()>& fun, bool skipSelf); // explicit instantiation
 
 void handleRCC(int fd, FDMultiplexer::funcparam_t& var)
@@ -1618 +1628 @@
   g_initialDomainMap = parseAuthAndForwards();
  
-  //  g_stats.remotes.resize(::arg().asNum("remotes-ringbuffer-entries")); XXX FIXME NEEDS TO BE REDONE FOR "MULTITHREADING"
-  if(!g_stats.remotes.empty())
-    memset(&g_stats.remotes[0], 0, g_stats.remotes.size() * sizeof(RecursorStats::remotes_t::value_type));
+    
   g_logCommonErrors=::arg().mustDo("log-common-errors");
   
@@ -1703 +1711 @@
     exit(99);
   }
+  
+  t_remotes = new RemoteKeeper();
+  t_remotes->remotes.resize(::arg().asNum("remotes-ringbuffer-entries") / g_numThreads); 
+  
+  if(!t_remotes->remotes.empty())
+    memset(&t_remotes->remotes[0], 0, t_remotes->remotes.size() * sizeof(RemoteKeeper::remotes_t::value_type));
+  
   
   MT=new MTasker<PacketID,string>(::arg().asNum("stack-size"));

trunk/pdns/pdns/rec_channel_rec.cc

@@ -433 +433 @@
 }
 
+vector<ComboAddress>* pleaseGetRemotes()
+{
+  return new vector<ComboAddress>(t_remotes->remotes);
+}
 
 string doTopRemotes()
@@ -438 +442 @@
   typedef map<ComboAddress, int, ComboAddress::addressOnlyLessThan> counts_t;
   counts_t counts;
-  
+
+  vector<ComboAddress> remotes=broadcastAccFunction<vector<ComboAddress> >(pleaseGetRemotes);
+    
   unsigned int total=0;
-  for(RecursorStats::remotes_t::const_iterator i=g_stats.remotes.begin(); i != g_stats.remotes.end(); ++i)
+  for(RemoteKeeper::remotes_t::const_iterator i = remotes.begin(); i != remotes.end(); ++i)
     if(i->sin4.sin_family) {
       total++;

trunk/pdns/pdns/syncres.hh

@@ -453 +453 @@
 typedef MTasker<PacketID,string> MT_t;
 extern __thread MT_t* MT;
+
 
 struct RecursorStats
@@ -481 +482 @@
   uint64_t packetCacheHits;
   time_t startupTime;
-
+};
+
+struct RemoteKeeper
+{
   typedef vector<ComboAddress> remotes_t;
   remotes_t remotes;
@@ -493 +497 @@
   }
 };
-
+extern __thread RemoteKeeper* t_remotes;
 string doQueueReloadLuaScript(vector<string>::const_iterator begin, vector<string>::const_iterator end);
 void parseACLs();