Avoid unnecessary "Synchronizing blockheaders" log messages

jonasschnelli · jonasschnelli · commit dcc448e3d2b9 · 2019-08-31T22:00:35.000+02:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2561,7 +2561,7 @@ bool CChainState::ActivateBestChainStep(CValidationState& state, const CChainPar
     return true;
 }
 
-static void NotifyHeaderTip() LOCKS_EXCLUDED(cs_main) {
+static bool NotifyHeaderTip() LOCKS_EXCLUDED(cs_main) {
     bool fNotify = false;
     bool fInitialBlockDownload = false;
     static CBlockIndex* pindexHeaderOld = nullptr;
@@ -2580,6 +2580,7 @@ static void NotifyHeaderTip() LOCKS_EXCLUDED(cs_main) {
     if (fNotify) {
         uiInterface.NotifyHeaderTip(fInitialBlockDownload, pindexHeader);
     }
+    return fNotify;
 }
 
 static void LimitValidationInterfaceQueue() LOCKS_EXCLUDED(cs_main) {
@@ -3400,8 +3401,7 @@ bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidatio
             }
         }
     }
-    NotifyHeaderTip();
-    {
+    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
`@@ -2561,7 +2561,7 @@ bool CChainState::ActivateBestChainStep(CValidationState& state, const CChainPar`
`2561`	`2561`	`return true;`
`2562`	`2562`	`}`
`2563`	`2563`
`2564`		`-static void NotifyHeaderTip() LOCKS_EXCLUDED(cs_main) {`
	`2564`	`+static bool NotifyHeaderTip() LOCKS_EXCLUDED(cs_main) {`
`2565`	`2565`	`bool fNotify = false;`
`2566`	`2566`	`bool fInitialBlockDownload = false;`
`2567`	`2567`	`static CBlockIndex* pindexHeaderOld = nullptr;`
`@@ -2580,6 +2580,7 @@ static void NotifyHeaderTip() LOCKS_EXCLUDED(cs_main) {`
`2580`	`2580`	`if (fNotify) {`
`2581`	`2581`	`uiInterface.NotifyHeaderTip(fInitialBlockDownload, pindexHeader);`
`2582`	`2582`	`}`
	`2583`	`+ return fNotify;`
`2583`	`2584`	`}`
`2584`	`2585`
`2585`	`2586`	`static void LimitValidationInterfaceQueue() LOCKS_EXCLUDED(cs_main) {`
`@@ -3400,8 +3401,7 @@ bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidatio`
`3400`	`3401`	`}`
`3401`	`3402`	`}`
`3402`	`3403`	`}`
`3403`		`- NotifyHeaderTip();`
`3404`		`- {`
	`3404`	`+ if (NotifyHeaderTip()) {`
`3405`	`3405`	`LOCK(cs_main);`
`3406`	`3406`	`if (::ChainstateActive().IsInitialBlockDownload() && ppindex && *ppindex) {`
`3407`	`3407`	`LogPrintf("Synchronizing blockheaders, height: %d (~%.2f%%)\n", (ppindex)->nHeight, 100.0/((ppindex)->nHeight+(GetAdjustedTime() - (ppindex)->GetBlockTime()) / Params().GetConsensus().nPowTargetSpacing) (*ppindex)->nHeight);`