aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-04-06 10:27:51 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-04-06 10:33:19 +0200
commit07398e8e9d2ef807e63abd0978a6e98549bdf271 (patch)
tree22e317de8ee0bdd4310159ca791c58c1b1de9a3d /src
parent1b2460bd5824170ab85757e35f81197199cce9d6 (diff)
downloadbitcoin-07398e8e9d2ef807e63abd0978a6e98549bdf271.tar.xz
init: allow shutdown during 'Activating best chain...'
Two-line patch to make it possible to shut down bitcoind cleanly during the initial ActivateBestChain. Fixes #6459 (among other complaints). To reproduce: - shutdown bitcoind - copy chainstate - start bitcoind - let the chain sync a bit - shutdown bitcoind - copy back old chainstate - start bitcoind - bitcoind will catch up with all blocks during Init() (the `boost::this_thread::interruption_point` / `ShutdownRequested()` dance is ugly, this should be refactored all over bitcoind at some point when moving from boost::threads to c++11 threads, but it works...)
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b68c6affae..c1137c9b1f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2877,6 +2877,8 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
CBlockIndex *pindexMostWork = NULL;
do {
boost::this_thread::interruption_point();
+ if (ShutdownRequested())
+ break;
CBlockIndex *pindexNewTip = NULL;
const CBlockIndex *pindexFork;