diff options
| author | practicalswift <[email protected]> | 2018-04-25 22:57:18 +0200 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2018-05-05 08:11:05 +0200 |
| commit | cbba1d2da42a9c813c50ea3b3c13ec9a518bc147 (patch) | |
| tree | 37a7f16a114cde0d2fc65dafa5afa72deafb957e /src | |
| parent | Merge #13163: Make it clear which functions that are intended to be translati... (diff) | |
| download | discoin-cbba1d2da42a9c813c50ea3b3c13ec9a518bc147.tar.xz discoin-cbba1d2da42a9c813c50ea3b3c13ec9a518bc147.zip | |
Add compile time checking for all ::mempool.cs runtime locking assertions
Diffstat (limited to 'src')
| -rw-r--r-- | src/policy/rbf.h | 2 | ||||
| -rw-r--r-- | src/rpc/blockchain.cpp | 2 | ||||
| -rw-r--r-- | src/txmempool.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/policy/rbf.h b/src/policy/rbf.h index b10532add..c0a25f75b 100644 --- a/src/policy/rbf.h +++ b/src/policy/rbf.h @@ -23,6 +23,6 @@ bool SignalsOptInRBF(const CTransaction &tx); // according to BIP 125 // This involves checking sequence numbers of the transaction, as well // as the sequence numbers of all in-mempool ancestors. -RBFTransactionState IsRBFOptIn(const CTransaction &tx, CTxMemPool &pool); +RBFTransactionState IsRBFOptIn(const CTransaction &tx, CTxMemPool &pool) EXCLUSIVE_LOCKS_REQUIRED(pool.cs); #endif // BITCOIN_POLICY_RBF_H diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index a50840950..a2d8ce155 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -383,7 +383,7 @@ static std::string EntryDescriptionString() " ... ]\n"; } -static void entryToJSON(UniValue &info, const CTxMemPoolEntry &e) +static void entryToJSON(UniValue &info, const CTxMemPoolEntry &e) EXCLUSIVE_LOCKS_REQUIRED(::mempool.cs) { AssertLockHeld(mempool.cs); diff --git a/src/txmempool.h b/src/txmempool.h index a1cde6f77..3f9fb4850 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -451,7 +451,7 @@ private: mutable bool blockSinceLastRollingFeeBump; mutable double rollingMinimumFeeRate; //!< minimum fee to get into the pool, decreases exponentially - void trackPackageRemoved(const CFeeRate& rate); + void trackPackageRemoved(const CFeeRate& rate) EXCLUSIVE_LOCKS_REQUIRED(cs); public: @@ -512,7 +512,7 @@ private: void UpdateParent(txiter entry, txiter parent, bool add); void UpdateChild(txiter entry, txiter child, bool add); - std::vector<indexed_transaction_set::const_iterator> GetSortedDepthAndScore() const; + std::vector<indexed_transaction_set::const_iterator> GetSortedDepthAndScore() const EXCLUSIVE_LOCKS_REQUIRED(cs); public: indirectmap<COutPoint, const CTransaction*> mapNextTx; @@ -572,7 +572,7 @@ public: * Set updateDescendants to true when removing a tx that was in a block, so * that any in-mempool descendants have their ancestor state updated. */ - void RemoveStaged(setEntries &stage, bool updateDescendants, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN); + void RemoveStaged(setEntries &stage, bool updateDescendants, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN) EXCLUSIVE_LOCKS_REQUIRED(cs); /** When adding transactions from a disconnected block back to the mempool, * new mempool entries may have children in the mempool (which is generally |