#1890 format

libdevcore/LevelDB.h

@@ -71,6 +71,7 @@ class LevelDB : public DatabaseFace {
     static std::atomic< uint64_t > g_keyDeletesStats;
     // count of the keys that are scheduled to be deleted but are not yet deleted
     static std::atomic< uint64_t > g_keysToBeDeletedStats;
+    static uint64_t getCurrentTimeMs();
 
 private:
     std::unique_ptr< leveldb::DB > m_db;
@@ -123,7 +124,6 @@ class LevelDB : public DatabaseFace {
         }
     };
     void openDBInstanceUnsafe();
-    uint64_t getCurrentTimeMs();
     void reopenDataBaseIfNeeded();
 };
 

libethereum/Client.cpp

@@ -718,7 +718,7 @@ size_t Client::syncTransactions(
 
 #ifdef HISTORIC_STATE
     LOG( m_logger ) << "HSCT: "
-                    << m_working.mutableState().mutableHistoricState().getBlockCommitTime();
+                    << m_working.mutableState().mutableHistoricState().getAndResetBlockCommitTime();
 #endif
     return goodReceipts;
 }

libhistoric/HistoricState.cpp

@@ -45,7 +45,7 @@ HistoricState::HistoricState( HistoricState const& _s )
       m_nonExistingAccountsCache( _s.m_nonExistingAccountsCache ),
       m_unrevertablyTouched( _s.m_unrevertablyTouched ),
       m_accountStartNonce( _s.m_accountStartNonce ),
-      m_blockCommitTimeMs( _s.m_blockCommitTimeMs ) {}
+      m_totalTimeSpentInStateCommitsPerBlock( _s.m_totalTimeSpentInStateCommitsPerBlock ) {}
 
 OverlayDB HistoricState::openDB(
     fs::path const& _basePath, h256 const& _genesisHash, WithExisting _we ) {
@@ -138,7 +138,7 @@ HistoricState& HistoricState::operator=( HistoricState const& _s ) {
     m_nonExistingAccountsCache = _s.m_nonExistingAccountsCache;
     m_unrevertablyTouched = _s.m_unrevertablyTouched;
     m_accountStartNonce = _s.m_accountStartNonce;
-    m_blockCommitTimeMs = _s.m_blockCommitTimeMs;
+    m_totalTimeSpentInStateCommitsPerBlock = _s.m_totalTimeSpentInStateCommitsPerBlock;
     return *this;
 }
 
@@ -196,23 +196,19 @@ void HistoricState::clearCacheIfTooLarge() const {
 }
 
 void HistoricState::commitExternalChanges( AccountMap const& _accountMap ) {
-    boost::chrono::high_resolution_clock::time_point historicStateStart =
-        boost::chrono::high_resolution_clock::now();
+    auto historicStateStart = dev::db::LevelDB::getCurrentTimeMs();
     commitExternalChangesIntoTrieDB( _accountMap, m_state );
     m_state.db()->commit();
     m_changeLog.clear();
     m_cache.clear();
     m_unchangedCacheEntries.clear();
-    boost::chrono::high_resolution_clock::time_point historicStateFinish =
-        boost::chrono::high_resolution_clock::now();
-    m_blockCommitTimeMs += boost::chrono::duration_cast< boost::chrono::milliseconds >(
-        historicStateFinish - historicStateStart )
-                               .count();
+    auto historicStateFinish = dev::db::LevelDB::getCurrentTimeMs();
+    m_totalTimeSpentInStateCommitsPerBlock += historicStateFinish - historicStateStart;
 }
 
-uint64_t HistoricState::getBlockCommitTime() {
-    uint64_t retVal = m_blockCommitTimeMs;
-    m_blockCommitTimeMs = 0;
+uint64_t HistoricState::getAndResetBlockCommitTime() {
+    uint64_t retVal = m_totalTimeSpentInStateCommitsPerBlock;
+    m_totalTimeSpentInStateCommitsPerBlock = 0;
     return retVal;
 }
 

libhistoric/HistoricState.h

@@ -296,7 +296,7 @@ class HistoricState {
 
     void setRootFromDB();
 
-    uint64_t getBlockCommitTime();
+    uint64_t getAndResetBlockCommitTime();
 
 private:
     /// Turns all "touched" empty accounts into non-alive accounts.
@@ -348,7 +348,7 @@ class HistoricState {
     AddressHash commitExternalChangesIntoTrieDB(
         AccountMap const& _cache, SecureTrieDB< Address, OverlayDB >& _state );
 
-    uint64_t m_blockCommitTimeMs = 0;
+    uint64_t m_totalTimeSpentInStateCommitsPerBlock = 0;
 };
 
 std::ostream& operator<<( std::ostream& _out, HistoricState const& _s );