diff options
author | Anthony Towns <aj@erisian.com.au> | 2020-02-28 12:02:10 +1000 |
---|---|---|
committer | Anthony Towns <aj@erisian.com.au> | 2020-03-06 23:13:31 +1000 |
commit | 306f71b4eb4a0fd8e64f47dc008bc235b80b13d9 (patch) | |
tree | da839e0cea4ea52524ca04e0c0c9cc71b5add687 /src/test/util | |
parent | 97aadf98d0b890e09eff45535fa13a663f27334d (diff) | |
download | bitcoin-306f71b4eb4a0fd8e64f47dc008bc235b80b13d9.tar.xz |
scheduler: don't rely on boost interrupt on shutdown
Calling interrupt_all() will immediately stop the scheduler, so it's
safe to invoke stop() beforehand, and this removes the reliance on boost
to interrupt serviceQueue().
Diffstat (limited to 'src/test/util')
-rw-r--r-- | src/test/util/setup_common.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index fc736bc3a1..53eb9ff43b 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -140,6 +140,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha TestingSetup::~TestingSetup() { + if (m_node.scheduler) m_node.scheduler->stop(); threadGroup.interrupt_all(); threadGroup.join_all(); GetMainSignals().FlushBackgroundCallbacks(); |