diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2018-03-20 21:04:27 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2018-04-03 21:53:27 -0700 |
| commit | 45dd13503918e75a45ce33eb5c934b998790fdc8 (patch) | |
| tree | d5febb2553c79a1dbedcfbf1eccc4c1ec99133a5 | |
| parent | ad960f5771dc251c8e1198dd8a82e18df4562171 (diff) | |
| download | bitcoin-45dd13503918e75a45ce33eb5c934b998790fdc8.tar.xz | |
Fix csBestBlock/cvBlockChange waiting in rpc/mining
| -rw-r--r-- | src/rpc/mining.cpp | 2 | ||||
| -rw-r--r-- | src/validation.cpp | 7 | ||||
| -rw-r--r-- | src/validation.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 06882c0dfd..5a5ff06fe3 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -471,7 +471,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request) checktxtime = std::chrono::steady_clock::now() + std::chrono::minutes(1); WaitableLock lock(csBestBlock); - while (chainActive.Tip()->GetBlockHash() == hashWatchedChain && IsRPCRunning()) + while (hashBestBlock == hashWatchedChain && IsRPCRunning()) { if (cvBlockChange.wait_until(lock, checktxtime) == std::cv_status::timeout) { diff --git a/src/validation.cpp b/src/validation.cpp index df8729e382..c3e411f1fc 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -204,6 +204,7 @@ CChain& chainActive = g_chainstate.chainActive; CBlockIndex *pindexBestHeader = nullptr; CWaitableCriticalSection csBestBlock; CConditionVariable cvBlockChange; +uint256 hashBestBlock; int nScriptCheckThreads = 0; std::atomic_bool fImporting(false); std::atomic_bool fReindex(false); @@ -2195,7 +2196,11 @@ void static UpdateTip(const CBlockIndex *pindexNew, const CChainParams& chainPar // New best block mempool.AddTransactionsUpdated(1); - cvBlockChange.notify_all(); + { + WaitableLock lock(csBestBlock); + hashBestBlock = pindexNew->GetBlockHash(); + cvBlockChange.notify_all(); + } std::vector<std::string> warningMessages; if (!IsInitialBlockDownload()) diff --git a/src/validation.h b/src/validation.h index 95c31bf0fc..b51ad9fc76 100644 --- a/src/validation.h +++ b/src/validation.h @@ -166,6 +166,7 @@ extern uint64_t nLastBlockWeight; extern const std::string strMessageMagic; extern CWaitableCriticalSection csBestBlock; extern CConditionVariable cvBlockChange; +extern uint256 hashBestBlock; extern std::atomic_bool fImporting; extern std::atomic_bool fReindex; extern int nScriptCheckThreads; |