diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-04-03 18:23:50 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-04-03 18:23:50 -0700 |
| commit | 1c4f02139c03d0eedd52ebe0f886d44820402bf6 (patch) | |
| tree | e385d39224a092453ddad0154514a96d30382be3 | |
| parent | 36fdfb989e383324b00e250040aadaeb8286256b (diff) | |
| parent | 92a129980fb9b506da6c7f876aa8adb405c88e17 (diff) | |
Merge pull request #2453 from sipa/txstats
Update transaction statistics
| -rw-r--r-- | src/checkpoints.cpp | 16 | ||||
| -rw-r--r-- | src/main.cpp | 5 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 62234b9117..9e8e0f7024 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -15,11 +15,11 @@ namespace Checkpoints typedef std::map<int, uint256> MapCheckpoints; // How many times we expect transactions after the last checkpoint to - // be slower. This number is conservative. On multi-core CPUs with - // parallel signature checking enabled, this number is way too high. - // We prefer a progressbar that's faster at the end than the other - // way around, though. - static const double fSigcheckVerificationFactor = 15.0; + // be slower. 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 fSigcheckVerificationFactor = 5.0; struct CCheckpointData { const MapCheckpoints *mapCheckpoints; @@ -48,10 +48,10 @@ namespace Checkpoints ; static const CCheckpointData data = { &mapCheckpoints, - 1357902690, // * UNIX timestamp of last checkpoint block - 11011160, // * total number of transactions between genesis and last checkpoint + 1363044259, // * UNIX timestamp of last checkpoint block + 14264869, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) - 50000.0 // * estimated number of transactions per day after checkpoint + 60000.0 // * estimated number of transactions per day after checkpoint }; static MapCheckpoints mapCheckpointsTestnet = diff --git a/src/main.cpp b/src/main.cpp index 60593c0d5f..52bf3faa64 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1868,9 +1868,10 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew) bnBestChainWork = pindexNew->bnChainWork; nTimeBestReceived = GetTime(); nTransactionsUpdated++; - printf("SetBestChain: new best=%s height=%d work=%s tx=%lu date=%s\n", + printf("SetBestChain: new best=%s height=%d work=%s tx=%lu date=%s progress=%f\n", BlockHashStr(hashBestChain).c_str(), nBestHeight, bnBestChainWork.ToString().c_str(), (unsigned long)pindexNew->nChainTx, - DateTimeStrFormat("%Y-%m-%d %H:%M:%S", pindexBest->GetBlockTime()).c_str()); + DateTimeStrFormat("%Y-%m-%d %H:%M:%S", pindexBest->GetBlockTime()).c_str(), + Checkpoints::GuessVerificationProgress(pindexBest)); // Check the version of the last 100 blocks to see if we need to upgrade: if (!fIsInitialDownload) |