[#893] added multi-threading parameters

1 files changed, 7 insertions, 4 deletions

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index abcfe4b25c..6d0be0cfbe 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -204,6 +204,8 @@ namespace dhcp {
 
 const std::string Dhcpv6Srv::VENDOR_CLASS_PREFIX("VENDOR_CLASS_");
 
+int Dhcpv6Srv::srv_thread_count_ = -1;
+
 Dhcpv6Srv::Dhcpv6Srv(uint16_t server_port, uint16_t client_port)
     : io_service_(new IOService()), server_port_(server_port),
       client_port_(client_port), serverid_(), shutdown_(true),
@@ -523,12 +525,13 @@ void Dhcpv6Srv::run_one() {
     try {
         bool read_pkt = true;
 
-        // Do not read more packets from socket if there are enough
-        // packets to be processed in the packet thread pool queue
-        const int max_queue_size = CfgMgr::instance().getCurrentCfg()->getServerMaxThreadQueueSize();
+        // Do not read more packets from socket if there are enough packets to
+        // be processed in the packet thread pool queue
+        // max_queue_size = 0 means no limit
+        const int max_queue_size = CfgMgr::instance().getCurrentCfg()->getPktThreadQueueSize();
         const int thread_count = MultiThreadingMgr::instance().getPktThreadPoolSize();
         size_t pkt_queue_size = MultiThreadingMgr::instance().getPktThreadPool().count();
-        if (thread_count && (pkt_queue_size >= thread_count * max_queue_size)) {
+        if (thread_count && max_queue_size && (pkt_queue_size >= thread_count * max_queue_size)) {
             read_pkt = false;
         }