node/chainstate: Decouple from GetTimeMillis

Summary: ``` ...instead just move it out ``` Partial backport of [[bitcoin/bitcoin#23280 | core#23280]]: bitcoin/bitcoin@cbac28b Depends on D12555. Test Plan: ninja all check-all Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D12556
Bitcoin-ABC · Nov 21, 2022 · d0f1c29 · d0f1c29
1 parent af94e52
commit d0f1c29
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -2654,11 +2654,17 @@ bool AppInitMain(Config &config, RPCServer &rpcServer,
 
         uiInterface.InitMessage(_("Loading block index...").translated);
 
+        const int64_t load_block_index_start_time = GetTimeMillis();
+
         if (!LoadChainstate(fLoaded, strLoadError, fReset, chainman, node,
                             fPruneMode, config, args, fReindexChainState,
                             nBlockTreeDBCache, nCoinDBCache, nCoinCacheUsage)) {
             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
@@ -31,7 +31,6 @@ bool LoadChainstate(bool &fLoaded, bilingual_str &strLoadError, bool fReset,
 
     do {
         bool failed_verification = false;
-        const int64_t load_block_index_start_time = GetTimeMillis();
         try {
             LOCK(cs_main);
             chainman.InitializeChainstate(Assert(node.mempool.get()));
@@ -215,8 +214,6 @@ bool LoadChainstate(bool &fLoaded, bilingual_str &strLoadError, bool fReset,
 
         if (!failed_verification) {
             fLoaded = true;
-            LogPrintf(" block index %15dms\n",
-                      GetTimeMillis() - load_block_index_start_time);
         }
     } while (false);