Add static locking analysis keywords

to CheckBlock and WriteBlockToDisk.
jamescowens · Sep 17, 2023 · 9c10ede · 9c10ede
1 parent 15df6c9
commit 9c10ede
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
@@ -15,7 +15,10 @@
 
 bool WriteBlockToDisk(const CBlock& block, unsigned int& nFileRet, unsigned int& nBlockPosRet,
                       const CMessageHeader::MessageStartChars& messageStart)
+        EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
+    AssertLockHeld(cs_main);
+
     // Open history file to append
     CAutoFile fileout(AppendBlockFile(nFileRet), SER_DISK, CLIENT_VERSION);
     if (fileout.IsNull())

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1752,7 +1752,10 @@ bool AddToBlockIndex(CBlock& block, unsigned int nFile, unsigned int nBlockPos,
 }
 
 bool CheckBlock(const CBlock& block, int height1, bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig, bool fLoadingIndex)
+        EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
+    AssertLockHeld(cs_main);
+
     // Allow the genesis block to pass.
     if(block.hashPrevBlock.IsNull() &&
        block.GetHash(true) == (fTestNet ? hashGenesisBlockTestNet : hashGenesisBlock))