|
|
|
@ -4141,44 +4141,22 @@ void DumpMempool(void)
@@ -4141,44 +4141,22 @@ void DumpMempool(void)
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* How many times slower we expect checking transactions after the last |
|
|
|
|
* checkpoint to be (from checking signatures, which is skipped up to the |
|
|
|
|
* last checkpoint). This number is a compromise, as it can't be accurate |
|
|
|
|
* for every system. When reindexing from a fast disk with a slow CPU, it |
|
|
|
|
* can be up to 20, while when downloading from a slow network with a |
|
|
|
|
* fast multicore CPU, it won't be much higher than 1. |
|
|
|
|
*/ |
|
|
|
|
static const double SIGCHECK_VERIFICATION_FACTOR = 5.0; |
|
|
|
|
|
|
|
|
|
//! Guess how far we are in the verification process at the given block index
|
|
|
|
|
double GuessVerificationProgress(const ChainTxData& data, CBlockIndex *pindex, bool fSigchecks) { |
|
|
|
|
if (pindex==NULL) |
|
|
|
|
double GuessVerificationProgress(const ChainTxData& data, CBlockIndex *pindex) { |
|
|
|
|
if (pindex == NULL) |
|
|
|
|
return 0.0; |
|
|
|
|
|
|
|
|
|
int64_t nNow = time(NULL); |
|
|
|
|
|
|
|
|
|
double fSigcheckVerificationFactor = fSigchecks ? SIGCHECK_VERIFICATION_FACTOR : 1.0; |
|
|
|
|
double fWorkBefore = 0.0; // Amount of work done before pindex
|
|
|
|
|
double fWorkAfter = 0.0; // Amount of work left after pindex (estimated)
|
|
|
|
|
// Work is defined as: 1.0 per transaction before the last checkpoint, and
|
|
|
|
|
// fSigcheckVerificationFactor per transaction after.
|
|
|
|
|
double fTxTotal; |
|
|
|
|
|
|
|
|
|
if (pindex->nChainTx <= data.nTransactionsLastCheckpoint) { |
|
|
|
|
double nCheapBefore = pindex->nChainTx; |
|
|
|
|
double nCheapAfter = data.nTransactionsLastCheckpoint - pindex->nChainTx; |
|
|
|
|
double nExpensiveAfter = (nNow - data.nTimeLastCheckpoint)/86400.0*data.fTransactionsPerDay; |
|
|
|
|
fWorkBefore = nCheapBefore; |
|
|
|
|
fWorkAfter = nCheapAfter + nExpensiveAfter*fSigcheckVerificationFactor; |
|
|
|
|
fTxTotal = data.nTransactionsLastCheckpoint + (nNow - data.nTimeLastCheckpoint) / 86400.0 * data.fTransactionsPerDay; |
|
|
|
|
} else { |
|
|
|
|
double nCheapBefore = data.nTransactionsLastCheckpoint; |
|
|
|
|
double nExpensiveBefore = pindex->nChainTx - data.nTransactionsLastCheckpoint; |
|
|
|
|
double nExpensiveAfter = (nNow - pindex->GetBlockTime())/86400.0*data.fTransactionsPerDay; |
|
|
|
|
fWorkBefore = nCheapBefore + nExpensiveBefore*fSigcheckVerificationFactor; |
|
|
|
|
fWorkAfter = nExpensiveAfter*fSigcheckVerificationFactor; |
|
|
|
|
fTxTotal = pindex->nChainTx + (nNow - pindex->GetBlockTime()) / 86400.0 * data.fTransactionsPerDay; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return fWorkBefore / (fWorkBefore + fWorkAfter); |
|
|
|
|
return pindex->nChainTx / fTxTotal; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
class CMainCleanup |
|
|
|
|