removed mutex

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 7d324ad4f7de14a6758e703f8919593089412b02..73a8c4c536e656010879e7e69da16cd37f9d541e 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -454,8 +454,6 @@ Dhcpv4Srv::Dhcpv4Srv(uint16_t server_port, uint16_t client_port,
       cb_control_(new CBControlDHCPv4()),
       run_multithreaded_(run_multithreaded) {
 
-    mutex_.reset(new std::mutex());
-
     LOG_DEBUG(dhcp4_logger, DBG_DHCP4_START, DHCP4_OPEN_SOCKET)
         .arg(server_port);
 

diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index 05ffc8616ea25959b39ffe320d92c7edb3ce133f..9660297a38f96c48aa244adb16e9042e46278819 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -1026,12 +1026,6 @@ protected:
     /// @brief Packet processing thread pool
     ThreadPool pkt_thread_pool_;
 
-    // Global mutex used to serialize packet thread pool's threads
-    // on the not thread safe code and allow threads to run
-    // simultaneously on the thread safe portions
-    // (e.g. CqlLeaseMgr class instance).
-    boost::scoped_ptr<std::mutex> mutex_;
-
     // Specifies if the application will use a thread pool or will process
     // received DHCP packets on the main thread.
     // It is mandatory to be set on false when running the test cases.

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index bc315587bbee33cc29bdc176f537b7aa331a1936..d3b4025e29a7a8e70b7f427a9182ac2d79ebcd98 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -181,7 +181,8 @@ namespace dhcp {
 
 const std::string Dhcpv6Srv::VENDOR_CLASS_PREFIX("VENDOR_CLASS_");
 
-Dhcpv6Srv::Dhcpv6Srv(uint16_t server_port, uint16_t client_port, bool run_multithreaded /* = false */)
+Dhcpv6Srv::Dhcpv6Srv(uint16_t server_port, uint16_t client_port,
+                     bool run_multithreaded /* = false */)
     : io_service_(new IOService()), server_port_(server_port),
       client_port_(client_port), serverid_(), shutdown_(true),
       alloc_engine_(), name_change_reqs_(),
@@ -189,8 +190,6 @@ Dhcpv6Srv::Dhcpv6Srv(uint16_t server_port, uint16_t client_port, bool run_multit
       cb_control_(new CBControlDHCPv6()),
       run_multithreaded_(run_multithreaded) {
 
-    mutex_.reset(new std::mutex());
-
     LOG_DEBUG(dhcp6_logger, DBG_DHCP6_START, DHCP6_OPEN_SOCKET)
         .arg(server_port);
 

diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index 6711ea80ebb3eef7ba4baf42ba25c92df19fc311..1ebd0b94ff66d3eafe236d6e90f138a09e67e0d0 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -1051,12 +1051,6 @@ protected:
     /// @brief Packet processing thread pool
     ThreadPool pkt_thread_pool_;
 
-    // Global mutex used to serialize packet thread pool's threads
-    // on the not thread safe code and allow threads to run
-    // simultaneously on the thread safe portions
-    // (e.g. CqlLeaseMgr class instance).
-    boost::scoped_ptr<std::mutex> mutex_;
-
     // Specifies if the application will use a thread pool or will process
     // received DHCP packets on the main thread.
     // It is mandatory to be set on false when running the test cases.