diff options
| author | Trung Tran <trung.tran@ettus.com> | 2019-01-09 21:49:49 -0800 |
|---|---|---|
| committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-14 09:43:56 -0800 |
| commit | 654c2fece997c4708dd928625494b8b796d1b2a2 (patch) | |
| tree | 13993efda1e51f22ecb2cc6fcfcfbd25a1243db8 /host | |
| parent | dceb0aef4000e5f37c5136c5b19436788d1feb2e (diff) | |
| download | uhd-654c2fece997c4708dd928625494b8b796d1b2a2.tar.gz uhd-654c2fece997c4708dd928625494b8b796d1b2a2.tar.bz2 uhd-654c2fece997c4708dd928625494b8b796d1b2a2.zip | |
mpmd_impl: move timeout constants to header
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_impl.hpp | 13 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_mboard_impl.cpp | 9 |
2 files changed, 13 insertions, 9 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_impl.hpp b/host/lib/usrp/mpmd/mpmd_impl.hpp index d01605426..b5d559e3e 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.hpp +++ b/host/lib/usrp/mpmd/mpmd_impl.hpp @@ -20,6 +20,19 @@ #include <map> #include <memory> +/************************************************************************* + * RPC timeout constants for MPMD + ************************************************************************/ +//! Time between reclaims (ms) +static constexpr size_t MPMD_RECLAIM_INTERVAL_MS = 1000; +//! Default timeout value for the init() RPC call (ms) +static constexpr size_t MPMD_DEFAULT_INIT_TIMEOUT = 120000; +//! Default timeout value for RPC calls (ms) +static constexpr size_t MPMD_DEFAULT_RPC_TIMEOUT = 2000; +//! Short timeout value for RPC calls (ms), used for calls that shouldn't +// take long. This value can be used to quickly determine a link status. +static constexpr size_t MPMD_SHORT_RPC_TIMEOUT = 2000; + namespace uhd { namespace mpmd { /*! Stores all attributes specific to a single MPM device diff --git a/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp b/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp index 89568d2cb..e58337dd2 100644 --- a/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp @@ -15,15 +15,6 @@ namespace { /************************************************************************* * Local constants ************************************************************************/ - //! Time between reclaims (ms) - constexpr size_t MPMD_RECLAIM_INTERVAL_MS = 1000; - //! Default timeout value for the init() RPC call (ms) - constexpr size_t MPMD_DEFAULT_INIT_TIMEOUT = 120000; - //! Default timeout value for RPC calls (ms) - constexpr size_t MPMD_DEFAULT_RPC_TIMEOUT = 2000; - //! Short timeout value for RPC calls (ms), used for calls that shouldn't - // take long. This value can be used to quickly determine a link status. - constexpr size_t MPMD_SHORT_RPC_TIMEOUT = 2000; //! Timeout for pings (seconds). constexpr double MPMD_PING_TIMEOUT = 0.1; //! Default session ID (MPM will recognize a session by this name) |