Mercurial > hg > bitcoin

changeset 2931:6a260282d203 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pieter Wuille <pieter.wuille@gmail.com>
date Tue, 17 Apr 2012 18:50:45 +0200
parents b2958cc2cbd6
children 17d13d3b283e
files src/main.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2618,7 +2618,7 @@
 
 bool SendMessages(CNode* pto, bool fSendTrickle)
 {
-    CRITICAL_BLOCK(cs_main)
+    TRY_CRITICAL_BLOCK(cs_main)
     {
         // Don't send anything until we get their version message
         if (pto->nVersion == 0)