From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 16 Aug 2021 14:27:13 +0000 (+0200)
Subject: Update multiplexer priorities so completion ports are preferred over /dev/poll
X-Git-Tag: dnsdist-1.7.0-alpha1~61^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10631%2Fhead;p=thirdparty%2Fpdns.git

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

diff --git a/pdns/devpollmplexer.cc b/pdns/devpollmplexer.cc
index b0c295862e..37a0d487ff 100644
--- 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 1be901da8e..d0cbf54885 100644
--- 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 14106412b5..cbb0442f0d 100644
--- 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 1ac5c633af..05ab28bf88 100644
--- 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 9e239c3aad..d4f36591b1 100644
--- 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;