diff options
| author |   Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
|---|---|---|
| committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
| commit | f2320939a5deec2db2948788479199931e1f9176 (patch) | |
| tree | fc1b12908503d5b7d67cefe34e0c5fb0f908d2a6 /src/rpc-server/trex_rpc_server.cpp | |
| parent | 1eed7e59f23d3ab9b957d9822eefe72877e291da (diff) | |
| parent | d04442ab671f768a1b645fb887d4a9cd575c7852 (diff) | |
Merge branch 'master' into cpu_per_core
Conflicts:
scripts/automation/trex_control_plane/server/singleton_daemon.py
Diffstat (limited to 'src/rpc-server/trex_rpc_server.cpp')
| -rw-r--r-- | src/rpc-server/trex_rpc_server.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/rpc-server/trex_rpc_server.cpp b/src/rpc-server/trex_rpc_server.cpp index e4ca95c3..6c323c16 100644 --- a/src/rpc-server/trex_rpc_server.cpp +++ b/src/rpc-server/trex_rpc_server.cpp @@ -36,8 +36,6 @@ TrexRpcServerInterface::TrexRpcServerInterface(const TrexRpcServerConfig &cfg, c m_name = name; m_lock = cfg.m_lock; - m_watchdog = cfg.m_watchdog; - m_watchdog_handle = -1; m_is_running = false; m_is_verbose = false; @@ -78,7 +76,6 @@ void TrexRpcServerInterface::start() { /* prepare for run */ _prepare(); - m_watchdog->mark_pending_monitor(); m_thread = new std::thread(&TrexRpcServerInterface::_rpc_thread_cb, this); if (!m_thread) { throw TrexRpcException("unable to create RPC thread"); |