diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-01-30 12:34:11 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-01-30 13:04:30 +0100 |
commit | 3448907a68e0f719be3bf82f4d321a30975d3539 (patch) | |
tree | 9201e7e58e6104f72906bd8f10ca6bdcace8d7de /src/init.h | |
parent | 7936446268e2f63baa855d694df0243924b7e1a9 (diff) | |
parent | 082a61c69d7a539b5a48c4376a657f1c5aa92d81 (diff) | |
download | bitcoin-3448907a68e0f719be3bf82f4d321a30975d3539.tar.xz |
Merge #12266: Move scheduler/threadGroup into common-init instead of per-app
082a61c Move scheduler/threadGroup into common-init instead of per-app (Matt Corallo)
Pull request description:
This resolves #12229 which pointed out a shutdown deadlock due to
scheduler/checkqueue having been shut down while network message
processing is still running.
Tree-SHA512: 0c0a76113996b164b0610d3b8c40b396f3e384d165bf098768e31fe3701b00763d0d810ef24702387e2e936fefb9fb900a6225f7417bb0175b585f365d542660
Diffstat (limited to 'src/init.h')
-rw-r--r-- | src/init.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init.h b/src/init.h index 843024f02b..33f97a55a5 100644 --- a/src/init.h +++ b/src/init.h @@ -19,7 +19,7 @@ class thread_group; void StartShutdown(); bool ShutdownRequested(); /** Interrupt threads */ -void Interrupt(boost::thread_group& threadGroup); +void Interrupt(); void Shutdown(); //!Initialize the logging infrastructure void InitLogging(); @@ -54,7 +54,7 @@ bool AppInitLockDataDirectory(); * @note This should only be done after daemonization. Call Shutdown() if this function fails. * @pre Parameters should be parsed and config file should be read, AppInitLockDataDirectory should have been called. */ -bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler); +bool AppInitMain(); /** The help message mode determines what help message to show */ enum HelpMessageMode { |