diff options
| author | Matt Corallo <[email protected]> | 2017-12-04 18:57:55 -0500 |
|---|---|---|
| committer | Matt Corallo <[email protected]> | 2017-12-26 11:54:49 -0500 |
| commit | 36137497f1e2b3324ca84550f4f295dcd605d1fa (patch) | |
| tree | 684bc166f66e54273396034cef46203eff8ca62b /src/validation.cpp | |
| parent | Add an interface to get the queue depth out of CValidationInterface (diff) | |
| download | discoin-36137497f1e2b3324ca84550f4f295dcd605d1fa.tar.xz discoin-36137497f1e2b3324ca84550f4f295dcd605d1fa.zip | |
Block ActivateBestChain to empty validationinterface queue
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 71a51c499..23ce6509d 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -40,6 +40,7 @@ #include <validationinterface.h> #include <warnings.h> +#include <future> #include <sstream> #include <boost/algorithm/string/replace.hpp> @@ -2566,6 +2567,18 @@ bool CChainState::ActivateBestChain(CValidationState &state, const CChainParams& int nStopAtHeight = gArgs.GetArg("-stopatheight", DEFAULT_STOPATHEIGHT); do { boost::this_thread::interruption_point(); + + if (GetMainSignals().CallbacksPending() > 10) { + // Block until the validation queue drains. This should largely + // never happen in normal operation, however may happen during + // reindex, causing memory blowup if we run too far ahead. + std::promise<void> promise; + CallFunctionInValidationInterfaceQueue([&promise] { + promise.set_value(); + }); + promise.get_future().wait(); + } + if (ShutdownRequested()) break; |