mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

[net processing] Change cs_main TRY_LOCK to LOCK in SendMessages()

Browse Source 
This was changed to TRY_LOCK in #1117 to fix a potential deadlock
between cs_main and cs_vSend. cs_vSend was split into cs_vSend and
cs_sendProcessing in #9535 (and cs_sendProcessing was changed from a
TRY_LOCK to a LOCK in the same PR).

Since cs_vSend can no longer be taken before cs_main, revert this to a
LOCK().

This commit leaves part of the code with bad indentation. That is fixed
by the next (whitespace change only) commit.
This commit is contained in:
John Newbery 2020-06-15 10:15:08 -04:00
parent c0b0b0240f
commit 1a1c23f8d4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/net_processing.cpp
View File

@ -3838,7 +3838,7 @@ public:
bool PeerLogicValidation::SendMessages(CNode* pto)
{
const Consensus::Params& consensusParams = Params().GetConsensus();
{
// Don't send anything until the version handshake is complete
if (!pto->fSuccessfullyConnected || pto->fDisconnect)
return true;
@ -3875,9 +3875,8 @@ bool PeerLogicValidation::SendMessages(CNode* pto)
}
}
TRY_LOCK(cs_main, lockMain);
if (!lockMain)
return true;
{
LOCK(cs_main);
if (MaybeDiscourageAndDisconnect(*pto)) return true;
@ -4416,7 +4415,7 @@ bool PeerLogicValidation::SendMessages(CNode* pto)
pto->m_tx_relay->nextSendTimeFeeFilter = timeNow + GetRandInt(MAX_FEEFILTER_CHANGE_DELAY) * 1000000;
}
}
}
} // release cs_main
return true;
}