Decouple block processing cs_main lock from the rest of inv get data …

…requests
PIVX-Project · Feb 21, 2021 · 31c7974 · 31c7974
1 parent da7c0f7
commit 31c7974
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -917,6 +917,8 @@ bool static IsTierTwoInventoryTypeKnown(int type)
 
 void static ProcessGetData(CNode* pfrom, CConnman& connman, const std::atomic<bool>& interruptMsgProc)
 {
+    AssertLockNotHeld(cs_main);
+
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
     std::vector<CInv> vNotFound;
     CNetMsgMaker msgMaker(pfrom->GetSendVersion());
@@ -957,15 +959,15 @@ void static ProcessGetData(CNode* pfrom, CConnman& connman, const std::atomic<bo
 
             // todo: inventory signal
         }
+    } // release cs_main
 
-        if (it != pfrom->vRecvGetData.end()) {
-            const CInv &inv = *it;
-            it++;
-            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK) {
-                ProcessGetBlockData(pfrom, inv, connman, interruptMsgProc);
-            }
+    if (it != pfrom->vRecvGetData.end()) {
+        const CInv &inv = *it;
+        it++;
+        if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK) {
+            ProcessGetBlockData(pfrom, inv, connman, interruptMsgProc);
         }
-    } // release cs_main
+    }
 
     pfrom->vRecvGetData.erase(pfrom->vRecvGetData.begin(), it);