sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#26215: Improve BaseIndex::BlockUntilSyncedToCurrentChain reliability

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2022-09-30 08:44:04 -04:00
parent 3bd584c845
commit 9e75b99c53
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/index/base.cpp
View File

@ -270,6 +270,10 @@ void BaseIndex::BlockConnected(const std::shared_ptr<const CBlock>& block, const
} }
if (WriteBlock(*block, pindex)) { if (WriteBlock(*block, pindex)) {
// Setting the best block index is intentionally the last step of this
// function, so BlockUntilSyncedToCurrentChain callers waiting for the
// best block index to be updated can rely on the block being fully
// processed, and the index object being safe to delete.
SetBestBlockIndex(pindex); SetBestBlockIndex(pindex);
} else { } else {
FatalError("%s: Failed to write block %s to index", FatalError("%s: Failed to write block %s to index",
@ -381,10 +385,17 @@ IndexSummary BaseIndex::GetSummary() const
void BaseIndex::SetBestBlockIndex(const CBlockIndex* block) { void BaseIndex::SetBestBlockIndex(const CBlockIndex* block) {
assert(!fPruneMode || AllowPrune()); assert(!fPruneMode || AllowPrune());
m_best_block_index = block;
if (AllowPrune() && block) { if (AllowPrune() && block) {
PruneLockInfo prune_lock; PruneLockInfo prune_lock;
prune_lock.height_first = block->nHeight; prune_lock.height_first = block->nHeight;
WITH_LOCK(::cs_main, m_chainstate->m_blockman.UpdatePruneLock(GetName(), prune_lock)); WITH_LOCK(::cs_main, m_chainstate->m_blockman.UpdatePruneLock(GetName(), prune_lock));
} }
// Intentionally set m_best_block_index as the last step in this function,
// after updating prune locks above, and after making any other references
// to *this, so the BlockUntilSyncedToCurrentChain function (which checks
// m_best_block_index as an optimization) can be used to wait for the last
// BlockConnected notification and safely assume that prune locks are
// updated and that the index object is safe to delete.
m_best_block_index = block;
} }