Merge #16793: refactor: Avoid locking cs_main in ProcessNewBlockHeaders

MarcoFalke · MarcoFalke · commit ae3e3bd151f4 · 2019-09-06T13:58:32.000+02:00
3109a1f refactor: Avoid locking cs_main in ProcessNewBlockHeaders (João Barbosa) Pull request description: Builds on #16774, this change avoids locking `cs_main` in `ProcessNewBlockHeaders` when the tip has changed - in this case the removed lock was necessary to just log a message. Top commit has no ACKs. Tree-SHA512: 31be6d319fa122804f72fa813cec5ed041dd7e4aef3c1921124a1f03016925c43cd4d9a272d80093e77fa7600e3506ef47b7bb821afcbffe01e6be9bceb6dc00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3398,7 +3398,6 @@ bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidatio
         }
     }
     if (NotifyHeaderTip()) {
-        LOCK(cs_main);
         if (::ChainstateActive().IsInitialBlockDownload() && ppindex && *ppindex) {
             LogPrintf("Synchronizing blockheaders, height: %d (~%.2f%%)\n", (*ppindex)->nHeight, 100.0/((*ppindex)->nHeight+(GetAdjustedTime() - (*ppindex)->GetBlockTime()) / Params().GetConsensus().nPowTargetSpacing) * (*ppindex)->nHeight);
         }

Original file line number	Diff line number	Diff line change
`@@ -3398,7 +3398,6 @@ bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidatio`
`3398`	`3398`	`}`
`3399`	`3399`	`}`
`3400`	`3400`	`if (NotifyHeaderTip()) {`
`3401`		`- LOCK(cs_main);`
`3402`	`3401`	`if (::ChainstateActive().IsInitialBlockDownload() && ppindex && *ppindex) {`
`3403`	`3402`	`LogPrintf("Synchronizing blockheaders, height: %d (~%.2f%%)\n", (ppindex)->nHeight, 100.0/((ppindex)->nHeight+(GetAdjustedTime() - (ppindex)->GetBlockTime()) / Params().GetConsensus().nPowTargetSpacing) (*ppindex)->nHeight);`
`3404`	`3403`	`}`