diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-05-23 19:17:09 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-06-07 11:06:00 +0200 |
| commit | fa0c9dbf9156d64a4b9bff858da97825369a9134 (patch) | |
| tree | e54ed5513a012acbe92cb553814f30ace3e54f16 | |
| parent | d0f81a96d9c158a9226dc946bdd61d48c4d42959 (diff) | |
txpool: Make nTransactionsUpdated atomic
| -rw-r--r-- | src/rpc/mining.cpp | 1 | ||||
| -rw-r--r-- | src/txmempool.cpp | 6 | ||||
| -rw-r--r-- | src/txmempool.h | 9 |
3 files changed, 8 insertions, 8 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); diff --git a/src/txmempool.cpp b/src/txmempool.cpp index cac7beb6a1..2f4e5fee4b 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -322,8 +322,8 @@ void CTxMemPoolEntry::UpdateAncestorState(int64_t modifySize, CAmount modifyFee, assert(int(nSigOpCostWithAncestors) >= 0); } -CTxMemPool::CTxMemPool(CBlockPolicyEstimator* estimator) : - nTransactionsUpdated(0), minerPolicyEstimator(estimator) +CTxMemPool::CTxMemPool(CBlockPolicyEstimator* estimator) + : nTransactionsUpdated(0), minerPolicyEstimator(estimator) { _clear(); //lock free clear @@ -341,13 +341,11 @@ bool CTxMemPool::isSpent(const COutPoint& outpoint) const unsigned int CTxMemPool::GetTransactionsUpdated() const { - LOCK(cs); return nTransactionsUpdated; } void CTxMemPool::AddTransactionsUpdated(unsigned int n) { - LOCK(cs); nTransactionsUpdated += n; } diff --git a/src/txmempool.h b/src/txmempool.h index ce0b762336..59514a945b 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -6,12 +6,13 @@ #ifndef BITCOIN_TXMEMPOOL_H #define BITCOIN_TXMEMPOOL_H +#include <atomic> +#include <map> #include <memory> #include <set> -#include <map> -#include <vector> -#include <utility> #include <string> +#include <utility> +#include <vector> #include <amount.h> #include <coins.h> @@ -443,7 +444,7 @@ class CTxMemPool { private: uint32_t nCheckFrequency GUARDED_BY(cs); //!< Value n means that n times in 2^32 we check. - unsigned int nTransactionsUpdated; //!< Used by getblocktemplate to trigger CreateNewBlock() invocation + std::atomic<unsigned int> nTransactionsUpdated; //!< Used by getblocktemplate to trigger CreateNewBlock() invocation CBlockPolicyEstimator* minerPolicyEstimator; uint64_t totalTxSize; //!< sum of all mempool tx's virtual sizes. Differs from serialized tx size since witness data is discounted. Defined in BIP 141. |