[#1147] Checkpoint: client queue of one

diff --git a/src/bin/dhcp4/client_handler.h b/src/bin/dhcp4/client_handler.h
index 6dc289beef108adcb131dd5c197ce1824c73d31f..dd9ef9ea31fb94841fe654cd77cd1ade66c9ebaf 100644 (file)
--- a/src/bin/dhcp4/client_handler.h
+++ b/src/bin/dhcp4/client_handler.h
@@ -21,22 +21,22 @@
 namespace isc {
 namespace dhcp {
 
-/// @brief Client race avoidance RAII handler.
-class ClientHandler : public boost::noncopyable {
-public:
+/// @brief Define the type of packet processing continuation.
+typedef std::function<void()> Continuation;
 
-    /// @brief Define the type of packet processing continuation.
-    typedef std::function<void()> Continuation;
+/// @brief Define the type of shared pointers to continuations.
+typedef boost::shared_ptr<Continuation> ContinuationPtr;
 
-    /// @brief Define the type of shared pointers to continuations.
-    typedef boost::shared_ptr<Continuation> ContinuationPtr;
+/// @brief Continuation factory.
+///
+/// @param cont Continuation rvalue.
+inline ContinuationPtr makeContinuation(Continuation&& cont) {
+    return (boost::make_shared<Continuation>(cont));
+}
 
-    /// @brief Continuation factory.
-    ///
-    /// @param cont Continuation rvalue.
-    static ContinuationPtr makeContinuation(Continuation&& cont) {
-        return (boost::make_shared<Continuation>(cont));
-    }
+/// @brief Client race avoidance RAII handler.
+class ClientHandler : public boost::noncopyable {
+public:
 
     /// @brief Constructor.
     ClientHandler();

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index e33e7de9cb2ae6a920b083994ab333b88e0ff5ef..bdd6a2c46f0354086550afb25fea58e760292af4 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -1224,20 +1224,6 @@ Dhcpv4Srv::processPacket(Pkt4Ptr& query, Pkt4Ptr& rsp, bool allow_packet_park) {
         return;
     }
 
-    // Create a client race avoidance RAII handler.
-    ClientHandler client_handler;
-
-    // Check for lease modifier queries from the same client being processed.
-    if (MultiThreadingMgr::instance().getMode() &&
-        ((query->getType() == DHCPDISCOVER) ||
-         (query->getType() == DHCPREQUEST) ||
-         (query->getType() == DHCPRELEASE) ||
-         (query->getType() == DHCPDECLINE))) {
-        if (client_handler.tryLock(query)) {
-            return;
-        }
-    }
-
     processDhcp4Query(query, rsp, allow_packet_park);
 }
 
@@ -1263,6 +1249,23 @@ Dhcpv4Srv::processDhcp4QueryAndSendResponse(Pkt4Ptr& query, Pkt4Ptr& rsp,
 void
 Dhcpv4Srv::processDhcp4Query(Pkt4Ptr& query, Pkt4Ptr& rsp,
                              bool allow_packet_park) {
+    // Create a client race avoidance RAII handler.
+    ClientHandler client_handler;
+
+    // Check for lease modifier queries from the same client being processed.
+    if (MultiThreadingMgr::instance().getMode() &&
+        ((query->getType() == DHCPDISCOVER) ||
+         (query->getType() == DHCPREQUEST) ||
+         (query->getType() == DHCPRELEASE) ||
+         (query->getType() == DHCPDECLINE))) {
+        ContinuationPtr cont =
+            makeContinuation(std::bind(&Dhcpv4Srv::processDhcp4QueryAndSendResponse,
+                                       this, query, rsp, allow_packet_park));
+        if (client_handler.tryLock(query, cont)) {
+            return;
+        }
+    }
+
     AllocEngine::ClientContext4Ptr ctx;
 
     try {

diff --git a/src/bin/dhcp4/tests/client_handler_unittest.cc b/src/bin/dhcp4/tests/client_handler_unittest.cc
index aa2e8d04608a946e019f1f5efbb3404509292844..c1c39b3172a0532c6a3c0880b06a375f6ecb8e7b 100644 (file)
--- a/src/bin/dhcp4/tests/client_handler_unittest.cc
+++ b/src/bin/dhcp4/tests/client_handler_unittest.cc
@@ -463,8 +463,8 @@ TEST_F(ClientHandleTest, serializeTwoQueriesById) {
         ClientHandler client_handler;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont1 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
+        ContinuationPtr cont1 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
 
         // Try to lock it with the discover.
         bool duplicate = false;
@@ -477,8 +477,8 @@ TEST_F(ClientHandleTest, serializeTwoQueriesById) {
         ClientHandler client_handler2;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont2 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
+        ContinuationPtr cont2 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
 
         // Try to lock it with a request.
         EXPECT_NO_THROW(duplicate = client_handler2.tryLock(req, cont2));
@@ -521,8 +521,8 @@ TEST_F(ClientHandleTest, serializeTwoQueriesByHWAddr) {
         ClientHandler client_handler;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont1 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
+        ContinuationPtr cont1 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
 
         // Try to lock it with the discover.
         bool duplicate = false;
@@ -535,8 +535,8 @@ TEST_F(ClientHandleTest, serializeTwoQueriesByHWAddr) {
         ClientHandler client_handler2;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont2 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
+        ContinuationPtr cont2 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
 
         // Try to lock it with a request.
         EXPECT_NO_THROW(duplicate = client_handler2.tryLock(req, cont2));
@@ -681,8 +681,8 @@ TEST_F(ClientHandleTest, serializeThreeQueriesById) {
         ClientHandler client_handler;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont1 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
+        ContinuationPtr cont1 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
 
         // Try to lock it with the discover.
         bool duplicate = false;
@@ -695,8 +695,8 @@ TEST_F(ClientHandleTest, serializeThreeQueriesById) {
         ClientHandler client_handler2;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont2 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
+        ContinuationPtr cont2 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
 
         // Try to lock it with a request.
         EXPECT_NO_THROW(duplicate = client_handler2.tryLock(req, cont2));
@@ -708,8 +708,8 @@ TEST_F(ClientHandleTest, serializeThreeQueriesById) {
         ClientHandler client_handler3;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont3 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled3, this));
+        ContinuationPtr cont3 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled3, this));
 
         // Try to lock it with a release.
         EXPECT_NO_THROW(duplicate = client_handler3.tryLock(rel, cont3));
@@ -759,8 +759,8 @@ TEST_F(ClientHandleTest, serializeThreeQueriesHWAddr) {
         ClientHandler client_handler;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont1 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
+        ContinuationPtr cont1 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
 
         // Try to lock it with the discover.
         bool duplicate = false;
@@ -773,8 +773,8 @@ TEST_F(ClientHandleTest, serializeThreeQueriesHWAddr) {
         ClientHandler client_handler2;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont2 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
+        ContinuationPtr cont2 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
 
         // Try to lock it with a request.
         EXPECT_NO_THROW(duplicate = client_handler2.tryLock(req, cont2));
@@ -786,8 +786,8 @@ TEST_F(ClientHandleTest, serializeThreeQueriesHWAddr) {
         ClientHandler client_handler3;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont3 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled3, this));
+        ContinuationPtr cont3 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled3, this));
 
         // Try to lock it with a release.
         EXPECT_NO_THROW(duplicate = client_handler3.tryLock(rel, cont3));
@@ -841,8 +841,8 @@ TEST_F(ClientHandleTest, serializeThreeQueriesMixed) {
         ClientHandler client_handler;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont1 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
+        ContinuationPtr cont1 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
 
         // Try to lock it with the discover.
         bool duplicate = false;
@@ -855,8 +855,8 @@ TEST_F(ClientHandleTest, serializeThreeQueriesMixed) {
         ClientHandler client_handler2;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont2 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
+        ContinuationPtr cont2 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
 
         // Try to lock it with a request.
         EXPECT_NO_THROW(duplicate = client_handler2.tryLock(req, cont2));
@@ -868,8 +868,8 @@ TEST_F(ClientHandleTest, serializeThreeQueriesMixed) {
         ClientHandler client_handler3;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont3 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled3, this));
+        ContinuationPtr cont3 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled3, this));
 
         // Try to lock it with a release.
         EXPECT_NO_THROW(duplicate = client_handler3.tryLock(rel, cont3));

diff --git a/src/bin/dhcp6/client_handler.h b/src/bin/dhcp6/client_handler.h
index 01f0dd113088c95de7f9e2813c888691d1ef3c1b..aae2d19c53268aafcea5dbdbc246e3ab3c13a0b1 100644 (file)
--- a/src/bin/dhcp6/client_handler.h
+++ b/src/bin/dhcp6/client_handler.h
@@ -20,22 +20,22 @@
 namespace isc {
 namespace dhcp {
 
-/// @brief Client race avoidance RAII handler.
-class ClientHandler : public boost::noncopyable {
-public:
+/// @brief Define the type of packet processing continuation.
+typedef std::function<void()> Continuation;
 
-    /// @brief Define the type of packet processing continuation.
-    typedef std::function<void()> Continuation;
+/// @brief Define the type of shared pointers to continuations.
+typedef boost::shared_ptr<Continuation> ContinuationPtr;
 
-    /// @brief Define the type of shared pointers to continuations.
-    typedef boost::shared_ptr<Continuation> ContinuationPtr;
+/// @brief Continuation factory.
+///
+/// @param cont Continuation rvalue.
+inline ContinuationPtr makeContinuation(Continuation&& cont) {
+    return (boost::make_shared<Continuation>(cont));
+}
 
-    /// @brief Continuation factory.
-    ///
-    /// @param cont Continuation rvalue.
-    static ContinuationPtr makeContinuation(Continuation&& cont) {
-        return (boost::make_shared<Continuation>(cont));
-    }
+/// @brief Client race avoidance RAII handler.
+class ClientHandler : public boost::noncopyable {
+public:
 
     /// @brief Constructor.
     ClientHandler();

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index cf673b0e8ea7408c592ecc7841017015be80b1b9..8a272cd335b8168039e0fe02d0f544921a333b19 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -851,7 +851,10 @@ Dhcpv6Srv::processDhcp6Query(Pkt6Ptr& query, Pkt6Ptr& rsp) {
          (query->getType() == DHCPV6_REBIND) ||
          (query->getType() == DHCPV6_RELEASE) ||
          (query->getType() == DHCPV6_DECLINE))) {
-        drop = client_handler.tryLock(query);
+        ContinuationPtr cont =
+            makeContinuation(std::bind(&Dhcpv6Srv::processDhcp6QueryAndSendResponse,
+                                       this, query, rsp));
+        drop = client_handler.tryLock(query, cont);
     }
 
     // Stop here if ClientHandler tryLock decided the packet is a duplicate.

diff --git a/src/bin/dhcp6/tests/client_handler_unittest.cc b/src/bin/dhcp6/tests/client_handler_unittest.cc
index cd4ee0f66a4b41790d6d653223099be6a61746a7..dc3b3304433a9e9ebe15be62315289bc60c98649 100644 (file)
--- a/src/bin/dhcp6/tests/client_handler_unittest.cc
+++ b/src/bin/dhcp6/tests/client_handler_unittest.cc
@@ -337,8 +337,8 @@ TEST_F(ClientHandleTest, serializeTwoQueries) {
         ClientHandler client_handler;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont1 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
+        ContinuationPtr cont1 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
 
         // Try to lock it with the solicit.
         bool duplicate = false;
@@ -351,8 +351,8 @@ TEST_F(ClientHandleTest, serializeTwoQueries) {
         ClientHandler client_handler2;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont2 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
+        ContinuationPtr cont2 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
 
         // Try to lock it with a request.
         EXPECT_NO_THROW(duplicate = client_handler2.tryLock(req, cont2));
@@ -443,8 +443,8 @@ TEST_F(ClientHandleTest, serializeThreeQueries) {
         ClientHandler client_handler;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont1 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
+        ContinuationPtr cont1 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled1, this));
 
         // Try to lock it with the solicit.
         bool duplicate = false;
@@ -457,8 +457,8 @@ TEST_F(ClientHandleTest, serializeThreeQueries) {
         ClientHandler client_handler2;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont2 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
+        ContinuationPtr cont2 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled2, this));
 
         // Try to lock it with a request.
         EXPECT_NO_THROW(duplicate = client_handler2.tryLock(req, cont2));
@@ -470,8 +470,8 @@ TEST_F(ClientHandleTest, serializeThreeQueries) {
         ClientHandler client_handler3;
 
         // Create a continuation.
-        ClientHandler::ContinuationPtr cont3 =
-            ClientHandler::makeContinuation(std::bind(&ClientHandleTest::setCalled3, this));
+        ContinuationPtr cont3 =
+            makeContinuation(std::bind(&ClientHandleTest::setCalled3, this));
 
         // Try to lock it with a renew.
         EXPECT_NO_THROW(duplicate = client_handler3.tryLock(ren, cont3));