Changeset 672

Timestamp:

04/10/2006 12:19:35 PM (3 years ago)

Author:

ahu

Message:

implement very simple SMP support

Location:

trunk/pdns/pdns

Files:

• pdns_recursor.cc (modified) (3 diffs)
• rec_control.cc (modified) (2 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -389 +389 @@
 void makeControlChannelSocket()
 {
-  s_rcc.listen(::arg()["socket-dir"]+"/pdns_recursor.controlsocket");
+  string sockname=::arg()["socket-dir"]+"/pdns_recursor.controlsocket";
+  if(::arg().mustDo("fork")) {
+    sockname+="."+lexical_cast<string>(getpid());
+    L<<Logger::Warning<<"Forked control socket name: "<<sockname<<endl;
+  }
+  s_rcc.listen(sockname);
 }
 
@@ -700 +705 @@
     ::arg().set("allow-from", "If set, only allow these comma separated netmasks to recurse")="";
     ::arg().set("max-tcp-per-client", "If set, maximum number of TCP sessions per client (IP address)")="0";
+    ::arg().set("fork", "If set, fork the daemon for possible double performance")="no";
 
     ::arg().setCmd("help","Provide a helpful message");
@@ -750 +756 @@
   }
 
-    makeClientSocket();
     makeUDPServerSockets();
     makeTCPServerSockets();
+
+    if(::arg().mustDo("fork")) {
+      fork();
+      L<<Logger::Warning<<"This is forked pid "<<getpid()<<endl;
+    }
+    makeClientSocket();
+
     makeControlChannelSocket();
     

trunk/pdns/pdns/rec_control.cc

@@ -32 +32 @@
 {
   arg().set("config-dir","Location of configuration directory (pdns.conf)")=SYSCONFDIR;
+
   arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
+  arg().set("socket-pid","When controlling multiple recursors, the target pid")="";
+
   arg().setCmd("help","Provide this helpful message");
 
@@ -50 +53 @@
 
   RecursorControlChannel rccS;
-  rccS.connect(arg()["socket-dir"], "pdns_recursor.controlsocket");
+  string sockname="pdns_recursor.controlsocket";
+  if(!arg()["socket-pid"].empty())
+    sockname+="."+arg()["socket-pid"];
+
+  rccS.connect(arg()["socket-dir"], sockname);
 
   const vector<string>&commands=arg().getCommands();