wip: drop cs_main guarding from m_block_index; introduce m_block_inde… #6453
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
UdjinM6
reviewed
Dec 6, 2024
| @@ -66,6 +66,7 @@ static FlatFileSeq UndoFileSeq(); | |||
| std::vector<CBlockIndex*> BlockManager::GetAllBlockIndices() | |||
| { | |||
| AssertLockHeld(cs_main); | |||
There was a problem hiding this comment.
Suggested change
| AssertLockHeld(cs_main); |
| @@ -82,7 +82,6 @@ MessageProcessingResult CQuorumBlockProcessor::ProcessMessage(const CNode& peer, | |||
| // Verify that quorumHash is part of the active chain and that it's the first block in the DKG interval | |||
| const CBlockIndex* pQuorumBaseBlockIndex; | |||
| { | |||
| @@ -404,7 +404,6 @@ CChainLocksHandler::BlockTxs::mapped_type CChainLocksHandler::GetBlockTxs(const | |||
|
|
|||
| uint32_t blockTime; | |||
| { | |||
| @@ -589,7 +589,6 @@ bool CInstantSendManager::CheckCanLock(const COutPoint& outpoint, bool printDebu | |||
| const CBlockIndex* pindexMined; | |||
| int nTxAge; | |||
| { | |||
| PrevBlockMap m_prev_block_index GUARDED_BY(cs_main); | ||
|
|
||
| std::vector<CBlockIndex*> GetAllBlockIndices() EXCLUSIVE_LOCKS_REQUIRED(::cs_main); | ||
| std::vector<CBlockIndex*> GetAllBlockIndices() EXCLUSIVE_LOCKS_REQUIRED(::cs_main, !m_block_index_mutex); |
There was a problem hiding this comment.
Suggested change
| std::vector<CBlockIndex*> GetAllBlockIndices() EXCLUSIVE_LOCKS_REQUIRED(::cs_main, !m_block_index_mutex); | |
| std::vector<CBlockIndex*> GetAllBlockIndices() EXCLUSIVE_LOCKS_REQUIRED(!m_block_index_mutex); |
| @@ -195,7 +196,7 @@ class BlockManager | |||
| uint64_t CalculateCurrentUsage(); | |||
|
|
|||
| //! Returns last CBlockIndex* that is a checkpoint | |||
| const CBlockIndex* GetLastCheckpoint(const CCheckpointData& data) EXCLUSIVE_LOCKS_REQUIRED(cs_main); | |||
| const CBlockIndex* GetLastCheckpoint(const CCheckpointData& data) EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_block_index_mutex); | |||
There was a problem hiding this comment.
Suggested change
| const CBlockIndex* GetLastCheckpoint(const CCheckpointData& data) EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_block_index_mutex); | |
| const CBlockIndex* GetLastCheckpoint(const CCheckpointData& data) EXCLUSIVE_LOCKS_REQUIRED(!m_block_index_mutex); |
knst
reviewed
Dec 6, 2024
| @@ -4750,14 +4775,14 @@ void CChainState::CheckBlockIndex() | |||
|
|
|||
| LOCK(cs_main); | |||
|
|
|||
| LOCK(m_blockman.m_block_index_mutex); | |||
There was a problem hiding this comment.
nit: why don't use here LOCK2(cs_main, m_blockman.m_block_index_mutex)?
|
This pull request has conflicts, please rebase. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…x_mutex
Please remove the italicized help prompts before submitting or merging
Provide a general summary of your changes in the Title above
Pull requests without a rationale and clear improvement may be closed
immediately.
Please provide clear motivation for your patch and explain how it improves
Dash Core user experience or Dash Core developer experience
significantly:
src/test/) orfunctional tests (see
test/). Contributors should note which tests covermodified code. If no tests exist for a region of modified code, new tests
should accompany the change.
explanation of the potential issue as well as reasoning for the way the bug
was fixed.
If a feature is based on a lot of dependencies, contributors should first
consider building the system outside of Dash Core, if possible.
Issue being fixed or feature implemented
What was done?
Describe your changes in detail
How Has This Been Tested?
Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran
to see how your change affects other areas of the code, etc.
Breaking Changes
Please describe any breaking changes your code introduces
Checklist:
Go over all the following points, and put an
xin all the boxes that apply.