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

Require WriteUndoDataForBlock() to hold mutex cs_main

Browse Source 
Mutex cs_main is already held by the caller of WriteUndoDataForBlock().
This change is needed to require CBlockIndex::GetUndoPos() to hold
cs_main and CBlockIndex::nStatus to be guarded by cs_main in the
following commits without adding 2 unnecessary cs_main locks to
WriteUndoDataForBlock().
This commit is contained in:
Jon Atack 2021-10-21 16:56:34 +02:00
parent 6fd4341c10
commit 2e557ced28
No known key found for this signature in database
GPG Key ID: 796C4109063D4EAF
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/node/blockstorage.cpp
View File

@ -712,6 +712,7 @@ static bool WriteBlockToDisk(const CBlock& block, FlatFilePos& pos, const CMessa
bool BlockManager::WriteUndoDataForBlock(const CBlockUndo& blockundo, BlockValidationState& state, CBlockIndex* pindex, const CChainParams& chainparams) bool BlockManager::WriteUndoDataForBlock(const CBlockUndo& blockundo, BlockValidationState& state, CBlockIndex* pindex, const CChainParams& chainparams)
{ {
AssertLockHeld(::cs_main);
// Write undo information to disk // Write undo information to disk
if (pindex->GetUndoPos().IsNull()) { if (pindex->GetUndoPos().IsNull()) {
FlatFilePos _pos; FlatFilePos _pos;

6
src/node/blockstorage.h
View File

@ -7,12 +7,15 @@
#include <fs.h> #include <fs.h>
#include <protocol.h> // For CMessageHeader::MessageStartChars #include <protocol.h> // For CMessageHeader::MessageStartChars
#include <sync.h>
#include <txdb.h> #include <txdb.h>
#include <atomic> #include <atomic>
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
extern RecursiveMutex cs_main;
class ArgsManager; class ArgsManager;
class BlockValidationState; class BlockValidationState;
class CBlock; class CBlock;
@ -146,7 +149,8 @@ public:
/** Get block file info entry for one block file */ /** Get block file info entry for one block file */
CBlockFileInfo* GetBlockFileInfo(size_t n); CBlockFileInfo* GetBlockFileInfo(size_t n);
bool WriteUndoDataForBlock(const CBlockUndo& blockundo, BlockValidationState& state, CBlockIndex* pindex, const CChainParams& chainparams); bool WriteUndoDataForBlock(const CBlockUndo& blockundo, BlockValidationState& state, CBlockIndex* pindex, const CChainParams& chainparams)
EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
FlatFilePos SaveBlockToDisk(const CBlock& block, int nHeight, CChain& active_chain, const CChainParams& chainparams, const FlatFilePos* dbp); FlatFilePos SaveBlockToDisk(const CBlock& block, int nHeight, CChain& active_chain, const CChainParams& chainparams, const FlatFilePos* dbp);