diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-05 19:35:36 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-05 19:39:30 +0000 |
| commit | 9b3520732a38b3e6cd6abf64131931f52337bb38 (patch) | |
| tree | 02b3920dc70b2c23167704eb6941244684ef1b6d | |
| parent | d1374ccd3ea7df17db98373bb53ef2a4e6dcd14a (diff) | |
Use steady_time for timeout handling
| -rw-r--r-- | storage/src/tests/visiting/visitormanagertest.cpp | 4 | ||||
| -rw-r--r-- | storage/src/tests/visiting/visitortest.cpp | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp index be4e7270c69..74a8c64d5df 100644 --- a/storage/src/tests/visiting/visitormanagertest.cpp +++ b/storage/src/tests/visiting/visitormanagertest.cpp @@ -217,7 +217,7 @@ VisitorManagerTest::getSession(uint32_t n) // Wait until we have started the visitor const std::vector<TestVisitorMessageSession*>& sessions(_messageSessionFactory->_visitorSessions); framework::defaultimplementation::RealClock clock; - framework::MilliSecTime endTime(clock.getTimeInMillis() + framework::MilliSecTime(30 * 1000)); + vespalib::steady_time endTime = clock.getMonotonicTime() + 30s; while (true) { { std::lock_guard lock(_messageSessionFactory->_accessLock); @@ -225,7 +225,7 @@ VisitorManagerTest::getSession(uint32_t n) return *sessions[n]; } } - if (clock.getTimeInMillis() > endTime) { + if (clock.getMonotonicTime() > endTime) { throw vespalib::IllegalStateException( "Timed out waiting for visitor session", VESPA_STRLOC); } diff --git a/storage/src/tests/visiting/visitortest.cpp b/storage/src/tests/visiting/visitortest.cpp index f3a538b7832..565131b3b99 100644 --- a/storage/src/tests/visiting/visitortest.cpp +++ b/storage/src/tests/visiting/visitortest.cpp @@ -256,11 +256,9 @@ TestVisitorMessageSession& VisitorTest::getSession(uint32_t n) { // Wait until we have started the visitor - const std::vector<TestVisitorMessageSession*>& sessions( - _messageSessionFactory->_visitorSessions); + const std::vector<TestVisitorMessageSession*>& sessions(_messageSessionFactory->_visitorSessions); framework::defaultimplementation::RealClock clock; - framework::MilliSecTime endTime( - clock.getTimeInMillis() + framework::MilliSecTime(30 * 1000)); + vespalib::steady_time endTime = clock.getMonotonicTime() + 30s; while (true) { { std::lock_guard lock(_messageSessionFactory->_accessLock); @@ -268,7 +266,7 @@ VisitorTest::getSession(uint32_t n) return *sessions[n]; } } - if (clock.getTimeInMillis() > endTime) { + if (clock.getMonotonicTime() > endTime) { throw vespalib::IllegalStateException( "Timed out waiting for visitor session", VESPA_STRLOC); } |