GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge d0d256536c into merged_master (Bitcoin PR #21016)

Browse source 
Copied the node.scheduler syntax to node.reverification_scheduler
This commit is contained in:
Andrew Poelstra 2021-06-20 15:07:25 +00:00
commit bc289db9e0
12 changed files with 45 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/util/setup_common.cpp
View file

@ -156,7 +156,7 @@ ChainTestingSetup::ChainTestingSetup(const std::string& chainName, const std::st
// We have to run a scheduler thread to prevent ActivateBestChain
// from blocking due to queue overrun.
m_node.scheduler = MakeUnique<CScheduler>();
threadGroup.create_thread([&] { TraceThread("scheduler", [&] { m_node.scheduler->serviceQueue(); }); });
m_node.scheduler->m_service_thread = std::thread([&] { TraceThread("scheduler", [&] { m_node.scheduler->serviceQueue(); }); });
GetMainSignals().RegisterBackgroundSignalScheduler(*m_node.scheduler);
pblocktree.reset(new CBlockTreeDB(1 << 20, true));
@ -175,8 +175,6 @@ ChainTestingSetup::ChainTestingSetup(const std::string& chainName, const std::st
ChainTestingSetup::~ChainTestingSetup()
{
if (m_node.scheduler) m_node.scheduler->stop();
threadGroup.interrupt_all();
threadGroup.join_all();
StopScriptCheckWorkerThreads();
GetMainSignals().FlushBackgroundCallbacks();
GetMainSignals().UnregisterBackgroundSignalScheduler();