Split ::HEADERS processing into two separate cs_main locks

TheBlueMatt · TheBlueMatt · commit 63fd101c529c · 2016-11-23T16:29:38.000-08:00
This will allow NotifyHeaderTip to be called from an
AcceptBlockHeader wrapper function without holding cs_main.
diff --git a/src/main.cpp b/src/main.cpp
@@ -5982,14 +5982,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             ReadCompactSize(vRecv); // ignore tx count; assume it is 0.
         }
 
-        {
-        LOCK(cs_main);
-
         if (nCount == 0) {
             // Nothing interesting. Stop asking this peers for more headers.
             return true;
         }
 
+        CBlockIndex *pindexLast = NULL;
+        {
+        LOCK(cs_main);
         CNodeState *nodestate = State(pfrom->GetId());
 
         // If this looks like it could be a block announcement (nCount <
@@ -6019,7 +6019,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        CBlockIndex *pindexLast = NULL;
         BOOST_FOREACH(const CBlockHeader& header, headers) {
             CValidationState state;
             if (pindexLast != NULL && header.hashPrevBlock != pindexLast->GetBlockHash()) {
@@ -6035,7 +6034,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
             }
         }
+        }
 
+        {
+        LOCK(cs_main);
+        CNodeState *nodestate = State(pfrom->GetId());
         if (nodestate->nUnconnectingHeaders > 0) {
             LogPrint("net", "peer=%d: resetting nUnconnectingHeaders (%d -> 0)\n", pfrom->id, nodestate->nUnconnectingHeaders);
         }

Original file line number	Diff line number	Diff line change
`@@ -5982,14 +5982,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`5982`	`5982`	`ReadCompactSize(vRecv); // ignore tx count; assume it is 0.`
`5983`	`5983`	`}`
`5984`	`5984`
`5985`		`- {`
`5986`		`- LOCK(cs_main);`
`5987`		`-`
`5988`	`5985`	`if (nCount == 0) {`
`5989`	`5986`	`// Nothing interesting. Stop asking this peers for more headers.`
`5990`	`5987`	`return true;`
`5991`	`5988`	`}`
`5992`	`5989`
	`5990`	`+ CBlockIndex *pindexLast = NULL;`
	`5991`	`+ {`
	`5992`	`+ LOCK(cs_main);`
`5993`	`5993`	`CNodeState *nodestate = State(pfrom->GetId());`
`5994`	`5994`
`5995`	`5995`	`// If this looks like it could be a block announcement (nCount <`
`@@ -6019,7 +6019,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`6019`	`6019`	`return true;`
`6020`	`6020`	`}`
`6021`	`6021`
`6022`		`- CBlockIndex *pindexLast = NULL;`
`6023`	`6022`	`BOOST_FOREACH(const CBlockHeader& header, headers) {`
`6024`	`6023`	`CValidationState state;`
`6025`	`6024`	`if (pindexLast != NULL && header.hashPrevBlock != pindexLast->GetBlockHash()) {`
`@@ -6035,7 +6034,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`6035`	`6034`	`}`
`6036`	`6035`	`}`
`6037`	`6036`	`}`
	`6037`	`+ }`
`6038`	`6038`
	`6039`	`+ {`
	`6040`	`+ LOCK(cs_main);`
	`6041`	`+ CNodeState *nodestate = State(pfrom->GetId());`
`6039`	`6042`	`if (nodestate->nUnconnectingHeaders > 0) {`
`6040`	`6043`	`LogPrint("net", "peer=%d: resetting nUnconnectingHeaders (%d -> 0)\n", pfrom->id, nodestate->nUnconnectingHeaders);`
`6041`	`6044`	`}`