diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-16 09:20:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 09:20:40 +0100 |
| commit | abb94528b80948696e29e58b569f84fb4c2f85b8 (patch) | |
| tree | f12f74488b3a9cd0cb04fde7dd0a488450f89e9c /vbench/src/apps/vbench/vbench.cpp | |
| parent | e13645c831e7e4e00f5a12d57b0fc8f81f2bd3a9 (diff) | |
| parent | 070fc34cee07db023824c76995bba43f2262d6c1 (diff) | |
Merge pull request #26055 from vespa-engine/havardpe/use-std-thread-directly
use std::thread directly
Diffstat (limited to 'vbench/src/apps/vbench/vbench.cpp')
| -rw-r--r-- | vbench/src/apps/vbench/vbench.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vbench/src/apps/vbench/vbench.cpp b/vbench/src/apps/vbench/vbench.cpp index b5c2897207f..c73f38adaf2 100644 --- a/vbench/src/apps/vbench/vbench.cpp +++ b/vbench/src/apps/vbench/vbench.cpp @@ -44,12 +44,13 @@ int run(const std::string &cfg_name) { VBench vbench(cfg); NotifyDone notify(done); vespalib::RunnablePair runBoth(vbench, notify); - auto thread = vespalib::Thread::start(runBoth, vbench_thread); + auto thread = vespalib::thread::start(runBoth, vbench_thread); while (!SIG::INT.check() && !SIG::TERM.check() && !done.await(1s)) {} if (!done.await(vespalib::duration::zero())) { vbench.abort(); done.await(); } + thread.join(); if (vbench.tainted()) { fprintf(stderr, "vbench failed: %s\n", vbench.tainted().reason().c_str()); |