sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#25079: index: Change sync variables to use std::chrono::steady_clock

Browse Source 
92b35aba224ad4440f3ea6c01c841596a6a3d6f4 index, refactor: Change sync variables to use `std::chrono::steady_clock` (w0xlt)

Pull request description:

  This PR refactors the sync variables to use `std::chrono::steady_clock` as it is best suitable for measuring intervals.

ACKs for top commit:
  jonatack:
    utACK 92b35aba224ad4440f3ea6c01c841596a6a3d6f4
  ajtowns:
    ACK 92b35aba224ad4440f3ea6c01c841596a6a3d6f4 - code review only

Tree-SHA512: cd4bafde47b30beb88c0aac247e41b4dced2ff2845c67a7043619da058dcff4f84374a7c704a698f3055c888d076d25503c2f38ace8fbc5456f624e0efe1e188
This commit is contained in:
MacroFake 2022-05-10 07:35:33 +02:00 committed by PastaPastaPasta
parent fb3d9a16bf
commit 6d534eebbc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/index/base.cpp
View File

@ -15,8 +15,8 @@
constexpr char DB_BEST_BLOCK = 'B'; constexpr char DB_BEST_BLOCK = 'B';
constexpr int64_t SYNC_LOG_INTERVAL = 30; // seconds constexpr auto SYNC_LOG_INTERVAL{30s};
constexpr int64_t SYNC_LOCATOR_WRITE_INTERVAL = 30; // seconds constexpr auto SYNC_LOCATOR_WRITE_INTERVAL{30s};
template <typename... Args> template <typename... Args>
static void FatalError(const char* fmt, const Args&... args) static void FatalError(const char* fmt, const Args&... args)
@ -127,8 +127,8 @@ void BaseIndex::ThreadSync()
if (!m_synced) { if (!m_synced) {
auto& consensus_params = Params().GetConsensus(); auto& consensus_params = Params().GetConsensus();
int64_t last_log_time = 0; std::chrono::steady_clock::time_point last_log_time{0s};
int64_t last_locator_write_time = 0; std::chrono::steady_clock::time_point last_locator_write_time{0s};
while (true) { while (true) {
if (m_interrupt) { if (m_interrupt) {
m_best_block_index = pindex; m_best_block_index = pindex;
@ -157,7 +157,7 @@ void BaseIndex::ThreadSync()
pindex = pindex_next; pindex = pindex_next;
} }
int64_t current_time = GetTime(); auto current_time{std::chrono::steady_clock::now()};
if (last_log_time + SYNC_LOG_INTERVAL < current_time) { if (last_log_time + SYNC_LOG_INTERVAL < current_time) {
LogPrintf("Syncing %s with block chain from height %d\n", LogPrintf("Syncing %s with block chain from height %d\n",
GetName(), pindex->nHeight); GetName(), pindex->nHeight);