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/init.h | |
| 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/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 { |