mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

validation: replace lock with annotation in UnloadBlockIndex()

Browse source
This commit is contained in:
Jon Atack 2022-02-09 14:01:32 +01:00
parent 6ac637f97f
commit daad0093e3
No known key found for this signature in database
GPG key ID: 796C4109063D4EAF
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/test/util/setup_common.cpp
View file

@ -180,7 +180,7 @@ ChainTestingSetup::~ChainTestingSetup()
m_node.banman.reset(); m_node.banman.reset();
m_node.addrman.reset(); m_node.addrman.reset();
m_node.args = nullptr; m_node.args = nullptr;
UnloadBlockIndex(m_node.mempool.get(), *m_node.chainman); WITH_LOCK(::cs_main, UnloadBlockIndex(m_node.mempool.get(), *m_node.chainman));
m_node.mempool.reset(); m_node.mempool.reset();
m_node.scheduler.reset(); m_node.scheduler.reset();
m_node.chainman->Reset(); m_node.chainman->Reset();

2
src/validation.cpp
View file

@ -4028,7 +4028,7 @@ void CChainState::UnloadBlockIndex() {
// block index state // block index state
void UnloadBlockIndex(CTxMemPool* mempool, ChainstateManager& chainman) void UnloadBlockIndex(CTxMemPool* mempool, ChainstateManager& chainman)
{ {
LOCK(cs_main); AssertLockHeld(::cs_main);
chainman.Unload(); chainman.Unload();
pindexBestHeader = nullptr; pindexBestHeader = nullptr;
if (mempool) mempool->clear(); if (mempool) mempool->clear();

2
src/validation.h
View file

@ -138,7 +138,7 @@ extern CBlockIndex *pindexBestHeader;
extern const std::vector<std::string> CHECKLEVEL_DOC; extern const std::vector<std::string> CHECKLEVEL_DOC;
/** Unload database information */ /** Unload database information */
void UnloadBlockIndex(CTxMemPool* mempool, ChainstateManager& chainman); void UnloadBlockIndex(CTxMemPool* mempool, ChainstateManager& chainman) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
/** Run instances of script checking worker threads */ /** Run instances of script checking worker threads */
void StartScriptCheckWorkerThreads(int threads_num); void StartScriptCheckWorkerThreads(int threads_num);
/** Stop all of the script checking worker threads */ /** Stop all of the script checking worker threads */