diff options
| author |   imarom <imarom@cisco.com> | 2016-06-19 18:05:54 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2016-06-20 11:55:13 +0300 |
| commit | 3ca8be805c26eddfe40c254bdca4e5ae71eee792 (patch) | |
| tree | fd2b06c04de32b6bad4f5d71203422fa7292efe2 /src/rpc-server/trex_rpc_server_api.h | |
| parent | 1bc9c49fa89a3942d3d1516217635d0c6e6b0c56 (diff) | |
WATCHDOG - refactor due to trex-211
Diffstat (limited to 'src/rpc-server/trex_rpc_server_api.h')
| -rw-r--r-- | src/rpc-server/trex_rpc_server_api.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rpc-server/trex_rpc_server_api.h b/src/rpc-server/trex_rpc_server_api.h index 3d9837ef..6df37b17 100644 --- a/src/rpc-server/trex_rpc_server_api.h +++ b/src/rpc-server/trex_rpc_server_api.h @@ -30,10 +30,10 @@ limitations under the License. #include <stdexcept> #include <trex_rpc_exception_api.h> #include <json/json.h> +#include "trex_watchdog.h" class TrexRpcServerInterface; class TrexRpcServerReqRes; -class TrexWatchDog; /** * defines a configuration of generic RPC server @@ -48,11 +48,10 @@ public: RPC_PROT_MOCK }; - TrexRpcServerConfig(rpc_prot_e protocol, uint16_t port, std::mutex *lock, TrexWatchDog *watchdog) { + TrexRpcServerConfig(rpc_prot_e protocol, uint16_t port, std::mutex *lock) { m_protocol = protocol; m_port = port; m_lock = lock; - m_watchdog = watchdog; } uint16_t get_port() const { @@ -69,7 +68,6 @@ private: public: std::mutex *m_lock; - TrexWatchDog *m_watchdog; }; /** @@ -142,8 +140,7 @@ protected: std::string m_name; std::mutex *m_lock; std::mutex m_dummy_lock; - TrexWatchDog *m_watchdog; - int m_watchdog_handle; + TrexMonitor m_monitor; }; /** |