diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-31 15:14:57 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-31 17:36:43 +0000 |
| commit | 2503a877f21838e66e873f839a5b6fd0c38abfab (patch) | |
| tree | 966ae9d7757aa58e7bff4aaa4b9b45b5f6668329 /vbench | |
| parent | 5ac0d0b71749c7555167c3c3906ff6843bf178f0 (diff) | |
Use vespalib::duration for timeouts
Diffstat (limited to 'vbench')
| -rw-r--r-- | vbench/src/apps/vbench/vbench.cpp | 4 | ||||
| -rw-r--r-- | vbench/src/tests/time_queue/time_queue_test.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vbench/src/apps/vbench/vbench.cpp b/vbench/src/apps/vbench/vbench.cpp index ab695f0b728..4b3419b2f50 100644 --- a/vbench/src/apps/vbench/vbench.cpp +++ b/vbench/src/apps/vbench/vbench.cpp @@ -45,8 +45,8 @@ int run(const std::string &cfg_name) { vespalib::RunnablePair runBoth(vbench, notify); vespalib::Thread thread(runBoth); thread.start(); - while (!SIG::INT.check() && !SIG::TERM.check() && !done.await(1000)) {} - if (!done.await(0)) { + while (!SIG::INT.check() && !SIG::TERM.check() && !done.await(1s)) {} + if (!done.await(vespalib::duration::zero())) { vbench.abort(); done.await(); } diff --git a/vbench/src/tests/time_queue/time_queue_test.cpp b/vbench/src/tests/time_queue/time_queue_test.cpp index 5ce4feab747..47c1afbfaa9 100644 --- a/vbench/src/tests/time_queue/time_queue_test.cpp +++ b/vbench/src/tests/time_queue/time_queue_test.cpp @@ -16,8 +16,8 @@ TEST_MT_FFF("time queue", 2, TimeQueue<int>(10.0, 5.0), vespalib::Gate(), vespal } else { double delay; std::vector<std::unique_ptr<int> > list; - EXPECT_TRUE(f2.await(20000)); - EXPECT_FALSE(f3.await(20)); + EXPECT_TRUE(f2.await(20s)); + EXPECT_FALSE(f3.await(20ms)); { f1.extract(1.5, list, delay); ASSERT_EQUAL(1u, list.size()); @@ -38,7 +38,7 @@ TEST_MT_FFF("time queue", 2, TimeQueue<int>(10.0, 5.0), vespalib::Gate(), vespal EXPECT_EQUAL(0u, list.size()); EXPECT_EQUAL(5.0, delay); } - EXPECT_TRUE(f3.await(20000)); + EXPECT_TRUE(f3.await(20s)); { f1.extract(99.25, list, delay); EXPECT_EQUAL(0u, list.size()); |