validation: follow-up nits for lock-free IsInitialBlockDownload()
Add `AssertLockHeld(cs_main)` to `ChainstateManager::UpdateIBDStatus()` given `EXCLUSIVE_LOCKS_REQUIRED(cs_main)`. Fix outdated comment about constness of `ChainstateManager::IsInitialBlockDownload()` (build passes without it). And since we're touching it, we might as well mark `ChainstateManager::IsInitialBlockDownload()` as `noexcept` now. Follow-up to #34253. Co-authored-by: Martin Zumsande <mzumsande@gmail.com>
This commit is contained in:
2 files changed
+4
-8
No files matched your search
+3
-7
@@ -1934,13 +1934,8 @@ void Chainstate::InitCoinsCache(size_t cache_size_bytes)
|
|||||||
m_coins_views->InitCache();
|
m_coins_views->InitCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
// This function must be marked `const` so that `CValidationInterface` clients
|
// Lock-free: depends on `m_cached_is_ibd`, which is latched by `UpdateIBDStatus()`.
|
||||||
// (which are given a `const Chainstate*`) can call it.
|
bool ChainstateManager::IsInitialBlockDownload() const noexcept
|
||||||
//
|
|
||||||
// It is lock-free and depends on `m_cached_is_ibd`, which is latched by
|
|
||||||
// `UpdateIBDStatus()`.
|
|
||||||
//
|
|
||||||
bool ChainstateManager::IsInitialBlockDownload() const
|
|
||||||
{
|
{
|
||||||
return m_cached_is_ibd.load(std::memory_order_relaxed);
|
return m_cached_is_ibd.load(std::memory_order_relaxed);
|
||||||
}
|
}
|
||||||
@@ -3322,6 +3317,7 @@ static SynchronizationState GetSynchronizationState(bool init, bool blockfiles_i
|
|||||||
|
|
||||||
void ChainstateManager::UpdateIBDStatus()
|
void ChainstateManager::UpdateIBDStatus()
|
||||||
{
|
{
|
||||||
|
AssertLockHeld(cs_main);
|
||||||
if (!m_cached_is_ibd.load(std::memory_order_relaxed)) return;
|
if (!m_cached_is_ibd.load(std::memory_order_relaxed)) return;
|
||||||
if (m_blockman.LoadingBlocks()) return;
|
if (m_blockman.LoadingBlocks()) return;
|
||||||
if (!CurrentChainstate().m_chain.IsTipRecent(MinimumChainWork(), m_options.max_tip_age)) return;
|
if (!CurrentChainstate().m_chain.IsTipRecent(MinimumChainWork(), m_options.max_tip_age)) return;
|
||||||
|
|||||||
+1
-1
@@ -1182,7 +1182,7 @@ public:
|
|||||||
mutable VersionBitsCache m_versionbitscache;
|
mutable VersionBitsCache m_versionbitscache;
|
||||||
|
|
||||||
/** Check whether we are doing an initial block download (synchronizing from disk or network) */
|
/** Check whether we are doing an initial block download (synchronizing from disk or network) */
|
||||||
bool IsInitialBlockDownload() const;
|
bool IsInitialBlockDownload() const noexcept;
|
||||||
|
|
||||||
/** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */
|
/** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */
|
||||||
double GuessVerificationProgress(const CBlockIndex* pindex) const EXCLUSIVE_LOCKS_REQUIRED(GetMutex());
|
double GuessVerificationProgress(const CBlockIndex* pindex) const EXCLUSIVE_LOCKS_REQUIRED(GetMutex());
|
||||||
|
|||||||
Reference in new issue
Block a user