Skip to content

Commit e11b649

Browse files
committed
validation: CVerifyDB::VerifyDB: Use locking annotation
...instead of recursively locking unconditionally
1 parent 03f75c4 commit e11b649

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/validation.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4245,7 +4245,8 @@ CVerifyDB::~CVerifyDB()
42454245

42464246
bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CChainState& active_chainstate, CCoinsView *coinsview, int nCheckLevel, int nCheckDepth)
42474247
{
4248-
LOCK(cs_main);
4248+
AssertLockHeld(cs_main);
4249+
42494250
assert(std::addressof(::ChainstateActive()) == std::addressof(active_chainstate));
42504251
if (active_chainstate.m_chain.Tip() == nullptr || active_chainstate.m_chain.Tip()->pprev == nullptr)
42514252
return true;

src/validation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ class CVerifyDB {
340340
public:
341341
CVerifyDB();
342342
~CVerifyDB();
343-
bool VerifyDB(const CChainParams& chainparams, CChainState& active_chainstate, CCoinsView *coinsview, int nCheckLevel, int nCheckDepth);
343+
bool VerifyDB(const CChainParams& chainparams, CChainState& active_chainstate, CCoinsView *coinsview, int nCheckLevel, int nCheckDepth) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
344344
};
345345

346346
enum DisconnectResult

0 commit comments

Comments
 (0)