Deadlock fixes

shadowproject · May 11, 2015 · 08b089c · 08b089c
1 parent 5b95332
commit 08b089c
Show file tree

Hide file tree

Showing 8 changed files with 135 additions and 110 deletions.
diff --git a/shadow.pro b/shadow.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = shadow
-VERSION = 1.3.2.3
+VERSION = 1.3.2.4
 INCLUDEPATH += src src/json src/qt
 DEFINES += BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       3
 #define CLIENT_VERSION_REVISION    2
-#define CLIENT_VERSION_BUILD       3
+#define CLIENT_VERSION_BUILD       4
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!

diff --git a/src/main.cpp b/src/main.cpp
@@ -6166,7 +6166,7 @@ bool ProcessMessages(CNode* pfrom)
 }
 
 
-bool SendMessages(CNode* pto, bool fSendTrickle)
+bool SendMessages(CNode* pto, std::vector<CNode*> &vNodesCopy, bool fSendTrickle)
 {
     // Don't send anything until we get their version message
     if (pto->nVersion == 0)
@@ -6214,23 +6214,20 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
     static int64_t nLastRebroadcast;
     if (!IsInitialBlockDownload() && (GetTime() - nLastRebroadcast > 24 * 60 * 60))
     {
+        BOOST_FOREACH(CNode* pnode, vNodesCopy)
         {
-            LOCK(cs_vNodes);
-            BOOST_FOREACH(CNode* pnode, vNodes)
-            {
-                // Periodically clear setAddrKnown to allow refresh broadcasts
-                if (nLastRebroadcast)
-                    pnode->setAddrKnown.clear();
+            // Periodically clear setAddrKnown to allow refresh broadcasts
+            if (nLastRebroadcast)
+                pnode->setAddrKnown.clear();
 
-                // Rebroadcast our address
-                if (!fNoListen)
-                {
-                    CAddress addr = GetLocalAddress(&pnode->addr);
-                    if (addr.IsRoutable())
-                        pnode->PushAddress(addr);
-                };
+            // Rebroadcast our address
+            if (!fNoListen)
+            {
+                CAddress addr = GetLocalAddress(&pnode->addr);
+                if (addr.IsRoutable())
+                    pnode->PushAddress(addr);
             };
-        }
+        };
         nLastRebroadcast = GetTime();
     };
 
@@ -6268,7 +6265,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
     std::vector<CInv> vInvWait;
 
     {
-        LOCK(pto->cs_inventory);
+        LOCK2(pwalletMain->cs_wallet, pto->cs_inventory);
         vInv.reserve(pto->vInventoryToSend.size());
         vInvWait.reserve(pto->vInventoryToSend.size());
         BOOST_FOREACH(const CInv& inv, pto->vInventoryToSend)

diff --git a/src/main.h b/src/main.h
@@ -117,7 +117,7 @@ void PrintBlockTree();
 CBlockIndex* FindBlockByHeight(int nHeight);
 CBlockThinIndex* FindBlockThinByHeight(int nHeight);
 bool ProcessMessages(CNode* pfrom);
-bool SendMessages(CNode* pto, bool fSendTrickle);
+bool SendMessages(CNode* pto, std::vector<CNode*> &vNodesCopy, bool fSendTrickle);
 
 bool LoadExternalBlockFile(int nFile, FILE* fileIn);
 

diff --git a/src/net.cpp b/src/net.cpp
@@ -1520,7 +1520,7 @@ void ThreadMessageHandler()
     for (;;)
     {
         boost::this_thread::interruption_point();
-        vector<CNode*> vNodesCopy;
+        std::vector<CNode*> vNodesCopy;
         {
             LOCK(cs_vNodes);
             vNodesCopy = vNodes;
@@ -1559,7 +1559,7 @@ void ThreadMessageHandler()
             {
                 TRY_LOCK(pnode->cs_vSend, lockSend);
                 if (lockSend)
-                    SendMessages(pnode, pnode == pnodeTrickle);
+                    SendMessages(pnode, vNodesCopy, pnode == pnodeTrickle);
             }
         };
 

diff --git a/src/net.h b/src/net.h
@@ -245,6 +245,7 @@ class SecMsgNode
 
     ~SecMsgNode() {};
 
+    CCriticalSection            cs_smsg_net;
     int64_t                     lastSeen;
     int64_t                     lastMatched;
     int64_t                     ignoreUntil;