Fix race condition in ZmqServer. (#850)

mint570 · web-flow · commit 253ceb61916f · 2024-01-29T19:47:29.000-08:00
Change-Id: Ieed4c409d680c76ebaff241e65a7d9b47b8fa771
diff --git a/common/zmqserver.cpp b/common/zmqserver.cpp
@@ -15,8 +15,8 @@ ZmqServer::ZmqServer(const std::string& endpoint)
     : m_endpoint(endpoint)
 {
     m_buffer.resize(MQ_RESPONSE_MAX_COUNT);
-    m_mqPollThread = std::make_shared<std::thread>(&ZmqServer::mqPollThread, this);
     m_runThread = true;
+    m_mqPollThread = std::make_shared<std::thread>(&ZmqServer::mqPollThread, this);
 
     SWSS_LOG_DEBUG("ZmqServer ctor endpoint: %s", endpoint.c_str());
 }

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ ZmqServer::ZmqServer(const std::string& endpoint)`
`15`	`15`	`: m_endpoint(endpoint)`
`16`	`16`	`{`
`17`	`17`	`m_buffer.resize(MQ_RESPONSE_MAX_COUNT);`
`18`		`- m_mqPollThread = std::make_shared<std::thread>(&ZmqServer::mqPollThread, this);`
`19`	`18`	`m_runThread = true;`
	`19`	`+ m_mqPollThread = std::make_shared<std::thread>(&ZmqServer::mqPollThread, this);`
`20`	`20`
`21`	`21`	`SWSS_LOG_DEBUG("ZmqServer ctor endpoint: %s", endpoint.c_str());`
`22`	`22`	`}`