Optimize ActivateBestChain for long chains
This commit is contained in:
parent
316623f2c1
commit
fb8fad1586
14
src/main.cpp
14
src/main.cpp
|
@ -2811,10 +2811,9 @@ static void PruneBlockIndexCandidates() {
|
||||||
* Try to make some progress towards making pindexMostWork the active block.
|
* Try to make some progress towards making pindexMostWork the active block.
|
||||||
* pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
|
* pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
|
||||||
*/
|
*/
|
||||||
static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock)
|
static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound)
|
||||||
{
|
{
|
||||||
AssertLockHeld(cs_main);
|
AssertLockHeld(cs_main);
|
||||||
bool fInvalidFound = false;
|
|
||||||
const CBlockIndex *pindexOldTip = chainActive.Tip();
|
const CBlockIndex *pindexOldTip = chainActive.Tip();
|
||||||
const CBlockIndex *pindexFork = chainActive.FindFork(pindexMostWork);
|
const CBlockIndex *pindexFork = chainActive.FindFork(pindexMostWork);
|
||||||
|
|
||||||
|
@ -2902,15 +2901,22 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
|
||||||
{
|
{
|
||||||
LOCK(cs_main);
|
LOCK(cs_main);
|
||||||
CBlockIndex *pindexOldTip = chainActive.Tip();
|
CBlockIndex *pindexOldTip = chainActive.Tip();
|
||||||
pindexMostWork = FindMostWorkChain();
|
if (pindexMostWork == NULL) {
|
||||||
|
pindexMostWork = FindMostWorkChain();
|
||||||
|
}
|
||||||
|
|
||||||
// Whether we have anything to do at all.
|
// Whether we have anything to do at all.
|
||||||
if (pindexMostWork == NULL || pindexMostWork == chainActive.Tip())
|
if (pindexMostWork == NULL || pindexMostWork == chainActive.Tip())
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL))
|
bool fInvalidFound = false;
|
||||||
|
if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL, fInvalidFound))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if (fInvalidFound) {
|
||||||
|
// Wipe cache, we may need another branch now.
|
||||||
|
pindexMostWork = NULL;
|
||||||
|
}
|
||||||
pindexNewTip = chainActive.Tip();
|
pindexNewTip = chainActive.Tip();
|
||||||
pindexFork = chainActive.FindFork(pindexOldTip);
|
pindexFork = chainActive.FindFork(pindexOldTip);
|
||||||
fInitialDownload = IsInitialBlockDownload();
|
fInitialDownload = IsInitialBlockDownload();
|
||||||
|
|
Loading…
Reference in New Issue