diff options
| author | Carl Dong <contact@carldong.me> | 2021-09-20 17:08:18 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-12-06 15:55:49 -0500 |
| commit | cbac28b72f5b831f6f84b7628f73e85627af3d94 (patch) | |
| tree | daa3ea28ebb0b5be33c636c61eadb82ebc11dda9 | |
| parent | cb64af9635a9553e335f2dc0b1cca20c6bbd0933 (diff) | |
| download | bitcoin-cbac28b72f5b831f6f84b7628f73e85627af3d94.tar.xz | |
node/chainstate: Decouple from GetTimeMillis
...instead just move it out
| -rw-r--r-- | src/init.cpp | 4 | ||||
| -rw-r--r-- | src/node/chainstate.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 869c3a8f7c..3dc73a058c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1419,6 +1419,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) uiInterface.InitMessage(_("Loading block index…").translated); + const int64_t load_block_index_start_time = GetTimeMillis(); bool rv = LoadChainstate(fLoaded, strLoadError, fReset, @@ -1432,6 +1433,9 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) nCoinDBCache, nCoinCacheUsage); if (!rv) return false; + if (fLoaded) { + LogPrintf(" block index %15dms\n", GetTimeMillis() - load_block_index_start_time); + } if (!fLoaded && !ShutdownRequested()) { // first suggest a reindex diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp index b7a92d412a..3da61c95b8 100644 --- a/src/node/chainstate.cpp +++ b/src/node/chainstate.cpp @@ -6,7 +6,7 @@ #include <chainparams.h> // for CChainParams #include <rpc/blockchain.h> // for RPCNotifyBlockChange -#include <util/time.h> // for GetTime, GetTimeMillis +#include <util/time.h> // for GetTime #include <util/translation.h> // for bilingual_str #include <node/blockstorage.h> // for CleanupBlockRevFiles, fHavePruned, fReindex #include <node/context.h> // for NodeContext @@ -31,7 +31,6 @@ bool LoadChainstate(bool& fLoaded, }; do { - const int64_t load_block_index_start_time = GetTimeMillis(); try { LOCK(cs_main); chainman.InitializeChainstate(Assert(node.mempool.get())); @@ -197,7 +196,6 @@ bool LoadChainstate(bool& fLoaded, if (!failed_verification) { fLoaded = true; - LogPrintf(" block index %15dms\n", GetTimeMillis() - load_block_index_start_time); } } while(false); return true; |