diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-05-20 11:34:31 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-05-21 08:13:00 -0400 |
| commit | fa4ea997b4da1ae0afafba223fff9efbeefaf555 (patch) | |
| tree | 9a819c005582d906d5a179c3a3e4eed6f19fbd84 /src | |
| parent | 25ad2c623af30056ffb36dcd203a52edda2b170f (diff) | |
| download | bitcoin-fa4ea997b4da1ae0afafba223fff9efbeefaf555.tar.xz | |
init: Setup scheduler in tests and init in exactly the same way
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 3 | ||||
| -rw-r--r-- | src/test/util/setup_common.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 025ae06520..786e032624 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1317,8 +1317,7 @@ bool AppInitMain(const util::Ref& context, NodeContext& node) node.scheduler = MakeUnique<CScheduler>(); // Start the lightweight task scheduler thread - CScheduler::Function serviceLoop = [&node]{ node.scheduler->serviceQueue(); }; - threadGroup.create_thread(std::bind(&TraceThread<CScheduler::Function>, "scheduler", serviceLoop)); + threadGroup.create_thread([&] { TraceThread("scheduler", [&] { node.scheduler->serviceQueue(); }); }); // Gather some entropy once per minute. node.scheduler->scheduleEvery([]{ diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index 86dac55b2b..37cdbf2dd6 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -129,7 +129,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const // We have to run a scheduler thread to prevent ActivateBestChain // from blocking due to queue overrun. - threadGroup.create_thread([&]{ m_node.scheduler->serviceQueue(); }); + threadGroup.create_thread([&] { TraceThread("scheduler", [&] { m_node.scheduler->serviceQueue(); }); }); GetMainSignals().RegisterBackgroundSignalScheduler(*m_node.scheduler); pblocktree.reset(new CBlockTreeDB(1 << 20, true)); |