From 306f71b4eb4a0fd8e64f47dc008bc235b80b13d9 Mon Sep 17 00:00:00 2001
From: Anthony Towns <aj@erisian.com.au>
Date: Fri, 28 Feb 2020 12:02:10 +1000
Subject: 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().
---
 src/test/util/setup_common.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/test/util/setup_common.cpp')

diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index fc736bc3a..53eb9ff43 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();
-- 
cgit v1.2.3