diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main_dpdk.cpp | 4 | ||||
| -rw-r--r-- | src/rpc-server/trex_rpc_req_resp_server.cpp | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp index 8ae44b02..dcef2f38 100644 --- a/src/main_dpdk.cpp +++ b/src/main_dpdk.cpp @@ -4777,8 +4777,8 @@ int main_test(int argc , char * argv[]){ } /* disable WD if needed */ - //CGlobalInfo::m_options.preview.getWDDisable()?false:true - TrexWatchDog::getInstance().init(true); /* always disable - due to trex-211 */ + bool wd_enable = (CGlobalInfo::m_options.preview.getWDDisable() ? false : true); + TrexWatchDog::getInstance().init(wd_enable); g_trex.m_sl_rx_running = false; if ( get_is_stateless() ) { diff --git a/src/rpc-server/trex_rpc_req_resp_server.cpp b/src/rpc-server/trex_rpc_req_resp_server.cpp index 75eec856..e0e7635c 100644 --- a/src/rpc-server/trex_rpc_req_resp_server.cpp +++ b/src/rpc-server/trex_rpc_req_resp_server.cpp @@ -201,23 +201,24 @@ void TrexRpcServerReqRes::process_request_raw(const std::string &request, std::s int index = 0; - /* expcetion safe */ - std::unique_lock<std::mutex> lock(*m_lock); - /* for every command parsed - launch it */ for (auto command : commands) { Json::Value single_response; + /* the command itself should be protected */ + std::unique_lock<std::mutex> lock(*m_lock); command->execute(single_response); + lock.unlock(); + delete command; response_json[index++] = single_response; + /* batch is like getting all the messages one by one - it should not be considered as stuck thread */ + /* need to think if this is a good thing */ + //m_monitor.tickle(); } - /* done with the lock */ - lock.unlock(); - /* write the JSON to string and sever on ZMQ */ if (response.size() == 1) { |