diff options
| author |   imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
| commit | 904eacd9be1230efb7ae0ab7997ec131b588ec8a (patch) | |
| tree | 8e4bcd1b1a5f683efdb8f3eeb962acefc3201961 /src/trex_watchdog.cpp | |
| parent | d2f1c8451e2e8ffc47b208f68f9b16697d706d60 (diff) | |
| parent | b81cdb6c2d6d118c1c346e7c8dae6a5e747d867d (diff) | |
Merge branch 'master' into capture
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
src/main_dpdk.cpp
Diffstat (limited to 'src/trex_watchdog.cpp')
| -rw-r--r-- | src/trex_watchdog.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/trex_watchdog.cpp b/src/trex_watchdog.cpp index d2b6b803..8a06746b 100644 --- a/src/trex_watchdog.cpp +++ b/src/trex_watchdog.cpp @@ -155,16 +155,14 @@ void TrexWatchDog::init(bool enable){ * */ TrexMonitor * TrexWatchDog::get_current_monitor() { - TrexMonitor * cur_monitor = NULL; for (int i = 0; i < m_mon_count; i++) { if ( m_monitors[i]->get_tid() == pthread_self() ) { - cur_monitor = m_monitors[i]; - break; + return m_monitors[i]; } } - return cur_monitor; + return NULL; } |