Fix potential deadlock #1117

pull sipa wants to merge 1 commits into bitcoin:master from sipa:deadlockfix changing 1 files +2 −2

sipa commented at 4:57 PM on April 17, 2012: member
Conflict:
- cs_main in ProcessMessages() (before calling ProcessMessages)
- cs_vSend in CNode::BeginMessage versus:
- cs_vSend in ThreadMessageHandler2 (before calling SendMessages)
- cs_main in SendMessages
Even though cs_vSend is a try_lock, if it succeeds simultaneously with the locking of cs_main in ProcessMessages(), it could cause a deadlock.

Fix potential deadlock

Conflict:
* cs_main in ProcessMessages() (before calling ProcessMessages)
* cs_vSend in CNode::BeginMessage
versus:
* cs_vSend in ThreadMessageHandler2 (before calling SendMessages)
* cs_main in SendMessages

Even though cs_vSend is a try_lock, if it succeeds simultaneously with
the locking of cs_main in ProcessMessages(), it could cause a deadlock.

c581cc16bb

gavinandresen commented at 5:39 PM on April 17, 2012: contributor

ACK
sipa referenced this in commit caeddc5d37 on Apr 17, 2012
sipa merged this on Apr 17, 2012
sipa closed this on Apr 17, 2012
coblee referenced this in commit 2eeb270008 on Jul 17, 2012
sipa deleted the branch on Jun 23, 2017
lateminer referenced this in commit 61ad5ad1ef on Jan 22, 2019
lateminer referenced this in commit 8d425bdf0d on Dec 25, 2019
jnewbery referenced this in commit 1996424bd9 on Jun 15, 2020
jnewbery referenced this in commit 06ebb5deaf on Jun 18, 2020
jnewbery referenced this in commit 8fc03f04a2 on Jun 18, 2020
jnewbery referenced this in commit e602e5518c on Jun 19, 2020
jnewbery referenced this in commit ee1a65a686 on Jun 19, 2020
Bushstar referenced this in commit 516f4bd4b2 on Jun 22, 2020
jnewbery referenced this in commit d1bb7c7c8d on Jul 7, 2020
jnewbery referenced this in commit eed431388a on Jul 8, 2020
jnewbery referenced this in commit 9e384f8cdf on Jul 8, 2020
jnewbery referenced this in commit e49a95e3fa on Jul 8, 2020
jnewbery referenced this in commit 0ab9aeced7 on Jul 10, 2020
jnewbery referenced this in commit 1a1c23f8d4 on Jul 11, 2020
jnewbery referenced this in commit 73fb51a5e5 on Jul 24, 2020
Warchant referenced this in commit 3e79e89fb7 on Aug 6, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

sipa

gavinandresen