highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-14 06:32:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[refactor] Move ComputeBlockVersion into VersionBitsCache

Browse Source 
This also changes ComputeBlockVersion to take the versionbits cache
mutex once, rather than once for each versionbits deployment.
This commit is contained in:
Anthony Towns
2021-04-16 18:34:34 +10:00
parent 4a69b4dbe0
commit c5f36725e8
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/versionbits.cpp
View File

@@ -212,16 +212,16 @@ uint32_t VersionBitsCache::Mask(const Consensus::Params& params, Consensus::Depl
return VersionBitsConditionChecker(pos).Mask(params);
}
extern VersionBitsCache g_versionbitscache; // removed in next commit
int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params)
int32_t VersionBitsCache::ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params)
{
LOCK(m_mutex);
int32_t nVersion = VERSIONBITS_TOP_BITS;
for (int i = 0; i < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; i++) {
ThresholdState state = g_versionbitscache.State(pindexPrev, params, static_cast<Consensus::DeploymentPos>(i));
Consensus::DeploymentPos pos = static_cast<Consensus::DeploymentPos>(i);
ThresholdState state = VersionBitsConditionChecker(pos).GetStateFor(pindexPrev, params, m_caches[pos]);
if (state == ThresholdState::LOCKED_IN || state == ThresholdState::STARTED) {
nVersion |= g_versionbitscache.Mask(params, static_cast<Consensus::DeploymentPos>(i));
nVersion |= Mask(params, pos);
}
}