diff options
| author | Matt Corallo <git@bluematt.me> | 2018-01-24 21:15:56 -0500 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2018-01-25 11:35:34 -0500 |
| commit | 082a61c69d7a539b5a48c4376a657f1c5aa92d81 (patch) | |
| tree | ddfc5d6520551cf395629583ae9e6088aa179af0 /src/bitcoind.cpp | |
| parent | 6970b30c6f1d2be7947295fe18f2390649b17a4b (diff) | |
| download | bitcoin-082a61c69d7a539b5a48c4376a657f1c5aa92d81.tar.xz | |
Move scheduler/threadGroup into common-init instead of per-app
This resolves #12229 which pointed out a shutdown deadlock due to
scheduler/checkqueue having been shut down while network message
processing is still running.
Diffstat (limited to 'src/bitcoind.cpp')
| -rw-r--r-- | src/bitcoind.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index de19787a16..d3eb60725f 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -14,7 +14,6 @@ #include <rpc/server.h> #include <init.h> #include <noui.h> -#include <scheduler.h> #include <util.h> #include <httpserver.h> #include <httprpc.h> @@ -40,7 +39,7 @@ * Use the buttons <code>Namespaces</code>, <code>Classes</code> or <code>Files</code> at the top of the page to start navigating the code. */ -void WaitForShutdown(boost::thread_group* threadGroup) +void WaitForShutdown() { bool fShutdown = ShutdownRequested(); // Tell the main threads to shutdown. @@ -49,11 +48,7 @@ void WaitForShutdown(boost::thread_group* threadGroup) MilliSleep(200); fShutdown = ShutdownRequested(); } - if (threadGroup) - { - Interrupt(*threadGroup); - threadGroup->join_all(); - } + Interrupt(); } ////////////////////////////////////////////////////////////////////////////// @@ -62,9 +57,6 @@ void WaitForShutdown(boost::thread_group* threadGroup) // bool AppInit(int argc, char* argv[]) { - boost::thread_group threadGroup; - CScheduler scheduler; - bool fRet = false; // @@ -165,7 +157,7 @@ bool AppInit(int argc, char* argv[]) // If locking the data directory failed, exit immediately return false; } - fRet = AppInitMain(threadGroup, scheduler); + fRet = AppInitMain(); } catch (const std::exception& e) { PrintExceptionContinue(&e, "AppInit()"); @@ -175,10 +167,9 @@ bool AppInit(int argc, char* argv[]) if (!fRet) { - Interrupt(threadGroup); - threadGroup.join_all(); + Interrupt(); } else { - WaitForShutdown(&threadGroup); + WaitForShutdown(); } Shutdown(); |