scripted-diff: Rename LockAnnotation to LockAssertion
-BEGIN VERIFY SCRIPT- git grep -l LockAnnotation | xargs sed -i 's/LockAnnotation/LockAssertion/' -END VERIFY SCRIPT-
This commit is contained in:
parent
de9b5dbca3
commit
9f85e9cb3d
4 changed files with 22 additions and 22 deletions
|
@ -41,7 +41,7 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
|
||||||
{
|
{
|
||||||
Optional<int> getHeight() override
|
Optional<int> getHeight() override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
int height = ::ChainActive().Height();
|
int height = ::ChainActive().Height();
|
||||||
if (height >= 0) {
|
if (height >= 0) {
|
||||||
return height;
|
return height;
|
||||||
|
@ -50,7 +50,7 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
|
||||||
}
|
}
|
||||||
Optional<int> getBlockHeight(const uint256& hash) override
|
Optional<int> getBlockHeight(const uint256& hash) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
CBlockIndex* block = LookupBlockIndex(hash);
|
CBlockIndex* block = LookupBlockIndex(hash);
|
||||||
if (block && ::ChainActive().Contains(block)) {
|
if (block && ::ChainActive().Contains(block)) {
|
||||||
return block->nHeight;
|
return block->nHeight;
|
||||||
|
@ -65,34 +65,34 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
|
||||||
}
|
}
|
||||||
uint256 getBlockHash(int height) override
|
uint256 getBlockHash(int height) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
CBlockIndex* block = ::ChainActive()[height];
|
CBlockIndex* block = ::ChainActive()[height];
|
||||||
assert(block != nullptr);
|
assert(block != nullptr);
|
||||||
return block->GetBlockHash();
|
return block->GetBlockHash();
|
||||||
}
|
}
|
||||||
int64_t getBlockTime(int height) override
|
int64_t getBlockTime(int height) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
CBlockIndex* block = ::ChainActive()[height];
|
CBlockIndex* block = ::ChainActive()[height];
|
||||||
assert(block != nullptr);
|
assert(block != nullptr);
|
||||||
return block->GetBlockTime();
|
return block->GetBlockTime();
|
||||||
}
|
}
|
||||||
int64_t getBlockMedianTimePast(int height) override
|
int64_t getBlockMedianTimePast(int height) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
CBlockIndex* block = ::ChainActive()[height];
|
CBlockIndex* block = ::ChainActive()[height];
|
||||||
assert(block != nullptr);
|
assert(block != nullptr);
|
||||||
return block->GetMedianTimePast();
|
return block->GetMedianTimePast();
|
||||||
}
|
}
|
||||||
bool haveBlockOnDisk(int height) override
|
bool haveBlockOnDisk(int height) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
CBlockIndex* block = ::ChainActive()[height];
|
CBlockIndex* block = ::ChainActive()[height];
|
||||||
return block && ((block->nStatus & BLOCK_HAVE_DATA) != 0) && block->nTx > 0;
|
return block && ((block->nStatus & BLOCK_HAVE_DATA) != 0) && block->nTx > 0;
|
||||||
}
|
}
|
||||||
Optional<int> findFirstBlockWithTimeAndHeight(int64_t time, int height, uint256* hash) override
|
Optional<int> findFirstBlockWithTimeAndHeight(int64_t time, int height, uint256* hash) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
CBlockIndex* block = ::ChainActive().FindEarliestAtLeast(time, height);
|
CBlockIndex* block = ::ChainActive().FindEarliestAtLeast(time, height);
|
||||||
if (block) {
|
if (block) {
|
||||||
if (hash) *hash = block->GetBlockHash();
|
if (hash) *hash = block->GetBlockHash();
|
||||||
|
@ -102,7 +102,7 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
|
||||||
}
|
}
|
||||||
Optional<int> findPruned(int start_height, Optional<int> stop_height) override
|
Optional<int> findPruned(int start_height, Optional<int> stop_height) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
if (::fPruneMode) {
|
if (::fPruneMode) {
|
||||||
CBlockIndex* block = stop_height ? ::ChainActive()[*stop_height] : ::ChainActive().Tip();
|
CBlockIndex* block = stop_height ? ::ChainActive()[*stop_height] : ::ChainActive().Tip();
|
||||||
while (block && block->nHeight >= start_height) {
|
while (block && block->nHeight >= start_height) {
|
||||||
|
@ -116,7 +116,7 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
|
||||||
}
|
}
|
||||||
Optional<int> findFork(const uint256& hash, Optional<int>* height) override
|
Optional<int> findFork(const uint256& hash, Optional<int>* height) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
const CBlockIndex* block = LookupBlockIndex(hash);
|
const CBlockIndex* block = LookupBlockIndex(hash);
|
||||||
const CBlockIndex* fork = block ? ::ChainActive().FindFork(block) : nullptr;
|
const CBlockIndex* fork = block ? ::ChainActive().FindFork(block) : nullptr;
|
||||||
if (height) {
|
if (height) {
|
||||||
|
@ -133,12 +133,12 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
|
||||||
}
|
}
|
||||||
CBlockLocator getTipLocator() override
|
CBlockLocator getTipLocator() override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
return ::ChainActive().GetLocator();
|
return ::ChainActive().GetLocator();
|
||||||
}
|
}
|
||||||
Optional<int> findLocatorFork(const CBlockLocator& locator) override
|
Optional<int> findLocatorFork(const CBlockLocator& locator) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
if (CBlockIndex* fork = FindForkInGlobalIndex(::ChainActive(), locator)) {
|
if (CBlockIndex* fork = FindForkInGlobalIndex(::ChainActive(), locator)) {
|
||||||
return fork->nHeight;
|
return fork->nHeight;
|
||||||
}
|
}
|
||||||
|
@ -146,12 +146,12 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
|
||||||
}
|
}
|
||||||
bool checkFinalTx(const CTransaction& tx) override
|
bool checkFinalTx(const CTransaction& tx) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
return CheckFinalTx(tx);
|
return CheckFinalTx(tx);
|
||||||
}
|
}
|
||||||
bool submitToMemoryPool(const CTransactionRef& tx, CAmount absurd_fee, CValidationState& state) override
|
bool submitToMemoryPool(const CTransactionRef& tx, CAmount absurd_fee, CValidationState& state) override
|
||||||
{
|
{
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
return AcceptToMemoryPool(::mempool, state, tx, nullptr /* missing inputs */, nullptr /* txn replaced */,
|
return AcceptToMemoryPool(::mempool, state, tx, nullptr /* missing inputs */, nullptr /* txn replaced */,
|
||||||
false /* bypass limits */, absurd_fee);
|
false /* bypass limits */, absurd_fee);
|
||||||
}
|
}
|
||||||
|
|
|
@ -145,7 +145,7 @@ void TestGUI()
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
auto locked_chain = wallet->chain().lock();
|
auto locked_chain = wallet->chain().lock();
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
|
|
||||||
WalletRescanReserver reserver(wallet.get());
|
WalletRescanReserver reserver(wallet.get());
|
||||||
reserver.reserve();
|
reserver.reserve();
|
||||||
|
|
|
@ -306,16 +306,16 @@ public:
|
||||||
|
|
||||||
// Utility class for indicating to compiler thread analysis that a mutex is
|
// Utility class for indicating to compiler thread analysis that a mutex is
|
||||||
// locked (when it couldn't be determined otherwise).
|
// locked (when it couldn't be determined otherwise).
|
||||||
struct SCOPED_LOCKABLE LockAnnotation
|
struct SCOPED_LOCKABLE LockAssertion
|
||||||
{
|
{
|
||||||
template <typename Mutex>
|
template <typename Mutex>
|
||||||
explicit LockAnnotation(Mutex& mutex) EXCLUSIVE_LOCK_FUNCTION(mutex)
|
explicit LockAssertion(Mutex& mutex) EXCLUSIVE_LOCK_FUNCTION(mutex)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG_LOCKORDER
|
#ifdef DEBUG_LOCKORDER
|
||||||
AssertLockHeld(mutex);
|
AssertLockHeld(mutex);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
~LockAnnotation() UNLOCK_FUNCTION() {}
|
~LockAssertion() UNLOCK_FUNCTION() {}
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // BITCOIN_SYNC_H
|
#endif // BITCOIN_SYNC_H
|
||||||
|
|
|
@ -44,7 +44,7 @@ BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions, TestChain100Setup)
|
||||||
|
|
||||||
auto chain = interfaces::MakeChain();
|
auto chain = interfaces::MakeChain();
|
||||||
auto locked_chain = chain->lock();
|
auto locked_chain = chain->lock();
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
|
|
||||||
// Verify ScanForWalletTransactions accommodates a null start block.
|
// Verify ScanForWalletTransactions accommodates a null start block.
|
||||||
{
|
{
|
||||||
|
@ -123,7 +123,7 @@ BOOST_FIXTURE_TEST_CASE(importmulti_rescan, TestChain100Setup)
|
||||||
|
|
||||||
auto chain = interfaces::MakeChain();
|
auto chain = interfaces::MakeChain();
|
||||||
auto locked_chain = chain->lock();
|
auto locked_chain = chain->lock();
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
|
|
||||||
// Prune the older block file.
|
// Prune the older block file.
|
||||||
PruneOneBlockFile(oldTip->GetBlockPos().nFile);
|
PruneOneBlockFile(oldTip->GetBlockPos().nFile);
|
||||||
|
@ -190,7 +190,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
|
||||||
|
|
||||||
auto chain = interfaces::MakeChain();
|
auto chain = interfaces::MakeChain();
|
||||||
auto locked_chain = chain->lock();
|
auto locked_chain = chain->lock();
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
|
|
||||||
std::string backup_file = (SetDataDir("importwallet_rescan") / "wallet.backup").string();
|
std::string backup_file = (SetDataDir("importwallet_rescan") / "wallet.backup").string();
|
||||||
|
|
||||||
|
@ -248,7 +248,7 @@ BOOST_FIXTURE_TEST_CASE(coin_mark_dirty_immature_credit, TestChain100Setup)
|
||||||
CWalletTx wtx(&wallet, m_coinbase_txns.back());
|
CWalletTx wtx(&wallet, m_coinbase_txns.back());
|
||||||
|
|
||||||
auto locked_chain = chain->lock();
|
auto locked_chain = chain->lock();
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
LOCK(wallet.cs_wallet);
|
LOCK(wallet.cs_wallet);
|
||||||
|
|
||||||
wtx.hashBlock = ::ChainActive().Tip()->GetBlockHash();
|
wtx.hashBlock = ::ChainActive().Tip()->GetBlockHash();
|
||||||
|
@ -273,7 +273,7 @@ static int64_t AddTx(CWallet& wallet, uint32_t lockTime, int64_t mockTime, int64
|
||||||
CBlockIndex* block = nullptr;
|
CBlockIndex* block = nullptr;
|
||||||
if (blockTime > 0) {
|
if (blockTime > 0) {
|
||||||
auto locked_chain = wallet.chain().lock();
|
auto locked_chain = wallet.chain().lock();
|
||||||
LockAnnotation lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
auto inserted = mapBlockIndex.emplace(GetRandHash(), new CBlockIndex);
|
auto inserted = mapBlockIndex.emplace(GetRandHash(), new CBlockIndex);
|
||||||
assert(inserted.second);
|
assert(inserted.second);
|
||||||
const uint256& hash = inserted.first->first;
|
const uint256& hash = inserted.first->first;
|
||||||
|
|
Loading…
Reference in a new issue