fix: bring back missing lock annotations

UdjinM6 · UdjinM6 · commit cd087fc6534d · 2023-05-18T12:49:15.000+03:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -635,7 +635,7 @@ static void UpdatePreferredDownload(const CNode& node, CNodeState* state) EXCLUS
     nPreferredDownload += state->fPreferredDownload;
 }
 
-bool PeerManagerImpl::MarkBlockAsReceived(const uint256& hash)
+bool PeerManagerImpl::MarkBlockAsReceived(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
     std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
     if (itInFlight != mapBlocksInFlight.end()) {
@@ -659,7 +659,7 @@ bool PeerManagerImpl::MarkBlockAsReceived(const uint256& hash)
     return false;
 }
 
-bool PeerManagerImpl::MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const CBlockIndex *pindex, std::list<QueuedBlock>::iterator **pit)
+bool PeerManagerImpl::MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const CBlockIndex *pindex, std::list<QueuedBlock>::iterator **pit) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
     CNodeState *state = State(nodeid);
     assert(state != nullptr);
@@ -728,7 +728,7 @@ static void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) EXCLUSIV
     }
 }
 
-void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid)
+void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
     AssertLockHeld(cs_main);
     CNodeState* nodestate = State(nodeid);
@@ -764,7 +764,7 @@ void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid)
     }
 }
 
-bool PeerManagerImpl::TipMayBeStale()
+bool PeerManagerImpl::TipMayBeStale() EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
     AssertLockHeld(cs_main);
     const Consensus::Params& consensusParams = m_chainparams.GetConsensus();
@@ -788,7 +788,7 @@ static bool PeerHasHeader(CNodeState *state, const CBlockIndex *pindex) EXCLUSIV
     return false;
 }
 
-void PeerManagerImpl::FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<const CBlockIndex*>& vBlocks, NodeId& nodeStaller)
+void PeerManagerImpl::FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<const CBlockIndex*>& vBlocks, NodeId& nodeStaller) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
     if (count == 0)
         return;
@@ -1709,7 +1709,7 @@ void PeerManagerImpl::BlockChecked(const CBlock& block, const BlockValidationSta
 //
 
 
-bool PeerManagerImpl::AlreadyHave(const CInv& inv)
+bool PeerManagerImpl::AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
     switch (inv.type)
     {
@@ -1993,7 +1993,7 @@ void static ProcessGetBlockData(CNode& pfrom, const CChainParams& chainparams, c
     }
 }
 
-void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic<bool>& interruptMsgProc)
+void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic<bool>& interruptMsgProc) LOCKS_EXCLUDED(cs_main) EXCLUSIVE_LOCKS_REQUIRED(peer.m_getdata_requests_mutex)
 {
     AssertLockNotHeld(cs_main);
 

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ static void UpdatePreferredDownload(const CNode& node, CNodeState* state) EXCLUS`
`635`	`635`	`nPreferredDownload += state->fPreferredDownload;`
`636`	`636`	`}`
`637`	`637`
`638`		`-bool PeerManagerImpl::MarkBlockAsReceived(const uint256& hash)`
	`638`	`+bool PeerManagerImpl::MarkBlockAsReceived(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)`
`639`	`639`	`{`
`640`	`640`	`std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);`
`641`	`641`	`if (itInFlight != mapBlocksInFlight.end()) {`
`@@ -659,7 +659,7 @@ bool PeerManagerImpl::MarkBlockAsReceived(const uint256& hash)`
`659`	`659`	`return false;`
`660`	`660`	`}`
`661`	`661`
`662`		`-bool PeerManagerImpl::MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const CBlockIndex pindex, std::list<QueuedBlock>::iterator *pit)`
	`662`	`+bool PeerManagerImpl::MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const CBlockIndex pindex, std::list<QueuedBlock>::iterator *pit) EXCLUSIVE_LOCKS_REQUIRED(cs_main)`
`663`	`663`	`{`
`664`	`664`	`CNodeState *state = State(nodeid);`
`665`	`665`	`assert(state != nullptr);`
`@@ -728,7 +728,7 @@ static void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) EXCLUSIV`
`728`	`728`	`}`
`729`	`729`	`}`
`730`	`730`
`731`		`-void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid)`
	`731`	`+void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid) EXCLUSIVE_LOCKS_REQUIRED(cs_main)`
`732`	`732`	`{`
`733`	`733`	`AssertLockHeld(cs_main);`
`734`	`734`	`CNodeState* nodestate = State(nodeid);`
`@@ -764,7 +764,7 @@ void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid)`
`764`	`764`	`}`
`765`	`765`	`}`
`766`	`766`
`767`		`-bool PeerManagerImpl::TipMayBeStale()`
	`767`	`+bool PeerManagerImpl::TipMayBeStale() EXCLUSIVE_LOCKS_REQUIRED(cs_main)`
`768`	`768`	`{`
`769`	`769`	`AssertLockHeld(cs_main);`
`770`	`770`	`const Consensus::Params& consensusParams = m_chainparams.GetConsensus();`
`@@ -788,7 +788,7 @@ static bool PeerHasHeader(CNodeState state, const CBlockIndex pindex) EXCLUSIV`
`788`	`788`	`return false;`
`789`	`789`	`}`
`790`	`790`
`791`		`-void PeerManagerImpl::FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<const CBlockIndex*>& vBlocks, NodeId& nodeStaller)`
	`791`	`+void PeerManagerImpl::FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<const CBlockIndex*>& vBlocks, NodeId& nodeStaller) EXCLUSIVE_LOCKS_REQUIRED(cs_main)`
`792`	`792`	`{`
`793`	`793`	`if (count == 0)`
`794`	`794`	`return;`
`@@ -1709,7 +1709,7 @@ void PeerManagerImpl::BlockChecked(const CBlock& block, const BlockValidationSta`
`1709`	`1709`	`//`
`1710`	`1710`
`1711`	`1711`
`1712`		`-bool PeerManagerImpl::AlreadyHave(const CInv& inv)`
	`1712`	`+bool PeerManagerImpl::AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)`
`1713`	`1713`	`{`
`1714`	`1714`	`switch (inv.type)`
`1715`	`1715`	`{`
`@@ -1993,7 +1993,7 @@ void static ProcessGetBlockData(CNode& pfrom, const CChainParams& chainparams, c`
`1993`	`1993`	`}`
`1994`	`1994`	`}`
`1995`	`1995`
`1996`		`-void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic<bool>& interruptMsgProc)`
	`1996`	`+void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic<bool>& interruptMsgProc) LOCKS_EXCLUDED(cs_main) EXCLUSIVE_LOCKS_REQUIRED(peer.m_getdata_requests_mutex)`
`1997`	`1997`	`{`
`1998`	`1998`	`AssertLockNotHeld(cs_main);`
`1999`	`1999`