highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-16 03:43:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move blockstorage-related unload to BlockManager::Unload

Browse Source 
This is a refactor and safe to do because:
* UnloadBlockIndex calls ChainstateManager::Unload, which calls
  BlockManager::Unload
* Only unit tests call Unload directly
This commit is contained in:
MarcoFalke 2022-01-05 16:23:55 +01:00
parent fa467f3913
commit fab262174b
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/node/blockstorage.cpp
View File

@ -348,6 +348,11 @@ void BlockManager::Unload()
} }
m_block_index.clear(); m_block_index.clear();
vinfoBlockFile.clear();
nLastBlockFile = 0;
setDirtyBlockIndex.clear();
setDirtyFileInfo.clear();
} }
bool BlockManager::WriteBlockIndexDB() bool BlockManager::WriteBlockIndexDB()

4
src/validation.cpp
View File

@ -3980,10 +3980,6 @@ void UnloadBlockIndex(CTxMemPool* mempool, ChainstateManager& chainman)
chainman.Unload(); chainman.Unload();
pindexBestHeader = nullptr; pindexBestHeader = nullptr;
if (mempool) mempool->clear(); if (mempool) mempool->clear();
vinfoBlockFile.clear();
nLastBlockFile = 0;
setDirtyBlockIndex.clear();
setDirtyFileInfo.clear();
g_versionbitscache.Clear(); g_versionbitscache.Clear();
for (int b = 0; b < VERSIONBITS_NUM_BITS; b++) { for (int b = 0; b < VERSIONBITS_NUM_BITS; b++) {
warningcache[b].clear(); warningcache[b].clear();