Update multiplexer priorities so completion ports are preferred over /dev/poll

diff --git a/pdns/devpollmplexer.cc b/pdns/devpollmplexer.cc
index b0c295862ea9ad4edc62564b1cb9b7aafd8b4c73..37a0d487fff60c37816822c9113c9bc1d4cb52ed 100644 (file)
--- a/pdns/devpollmplexer.cc
+++ b/pdns/devpollmplexer.cc
@@ -71,7 +71,7 @@ static struct DevPollRegisterOurselves
 {
   DevPollRegisterOurselves()
   {
-    FDMultiplexer::getMultiplexerMap().insert(make_pair(0, &makeDevPoll)); // priority 0!
+    FDMultiplexer::getMultiplexerMap().emplace(1, &makeDevPoll); // priority 1, so that /dev/poll is preferred over poll, but not over completion ports!
   }
 } doItDevPoll;
 

diff --git a/pdns/epollmplexer.cc b/pdns/epollmplexer.cc
index 1be901da8e331bac2700c2ff2f9836df99d5b736..d0cbf548851e2fdeb3298cd83ae3eb2df732f414 100644 (file)
--- a/pdns/epollmplexer.cc
+++ b/pdns/epollmplexer.cc
@@ -71,7 +71,7 @@ static struct EpollRegisterOurselves
 {
   EpollRegisterOurselves()
   {
-    FDMultiplexer::getMultiplexerMap().insert(make_pair(0, &makeEpoll)); // priority 0!
+    FDMultiplexer::getMultiplexerMap().emplace(0, &makeEpoll); // priority 0!
   }
 } doItEpoll;
 

diff --git a/pdns/kqueuemplexer.cc b/pdns/kqueuemplexer.cc
index 14106412b551db64298498ea390bd1f35c5bb55e..cbb0442f0d7e3c12567b5f3d88d55463c5413653 100644 (file)
--- a/pdns/kqueuemplexer.cc
+++ b/pdns/kqueuemplexer.cc
@@ -74,7 +74,7 @@ static struct KqueueRegisterOurselves
 {
   KqueueRegisterOurselves()
   {
-    FDMultiplexer::getMultiplexerMap().insert(make_pair(0, &make)); // priority 0!
+    FDMultiplexer::getMultiplexerMap().emplace(0, &make); // priority 0!
   }
 } kQueueDoIt;
 

diff --git a/pdns/pollmplexer.cc b/pdns/pollmplexer.cc
index 1ac5c633afbfce503a81a121aac6a9bad5a15b42..05ab28bf88c2eff389b3676843461a4116bb0635 100644 (file)
--- a/pdns/pollmplexer.cc
+++ b/pdns/pollmplexer.cc
@@ -59,7 +59,7 @@ static struct RegisterOurselves
 {
   RegisterOurselves()
   {
-    FDMultiplexer::getMultiplexerMap().insert(make_pair(1, &make));
+    FDMultiplexer::getMultiplexerMap().emplace(2, &make);
   }
 } doIt;
 

diff --git a/pdns/portsmplexer.cc b/pdns/portsmplexer.cc
index 9e239c3aad7b40d94e35b7656f92a2aa72b69b43..d4f36591b149b432e5779e6a6bcc9410f043fcbf 100644 (file)
--- a/pdns/portsmplexer.cc
+++ b/pdns/portsmplexer.cc
@@ -49,7 +49,7 @@ static struct PortsRegisterOurselves
 {
   PortsRegisterOurselves()
   {
-    FDMultiplexer::getMultiplexerMap().insert(make_pair(0, &makePorts)); // priority 0!
+    FDMultiplexer::getMultiplexerMap().emplace(0, &makePorts); // priority 0!
   }
 } doItPorts;