aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/mining.cpp
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-05-23 19:17:09 +0200
committerMarcoFalke <falke.marco@gmail.com>2019-06-07 11:06:00 +0200
commitfa0c9dbf9156d64a4b9bff858da97825369a9134 (patch)
treee54ed5513a012acbe92cb553814f30ace3e54f16 /src/rpc/mining.cpp
parentd0f81a96d9c158a9226dc946bdd61d48c4d42959 (diff)
downloadbitcoin-fa0c9dbf9156d64a4b9bff858da97825369a9134.tar.xz
txpool: Make nTransactionsUpdated atomic
Diffstat (limited to 'src/rpc/mining.cpp')
-rw-r--r--src/rpc/mining.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 477f05f46c..ba5e0cdf64 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -480,6 +480,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request)
if (g_best_block_cv.wait_until(lock, checktxtime) == std::cv_status::timeout)
{
// Timeout: Check transactions for update
+ // without holding ::mempool.cs to avoid deadlocks
if (mempool.GetTransactionsUpdated() != nTransactionsUpdatedLastLP)
break;
checktxtime += std::chrono::seconds(10);