oxen-io/oxen-core
2
1
Fork 0
mirror of https://github.com/oxen-io/oxen-core.git synced 2023-12-14 02:22:56 +01:00
Code Issues Projects Releases Wiki Activity

Add progress meter to pop_blocks (#770)

Browse source
This commit is contained in:
Doyle 2019-08-07 11:43:39 +10:00 committed by GitHub
parent d14aba3329
commit 8060f00428
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/perf_timer.h
View file

@ -54,7 +54,9 @@ public:
void resume();
void reset();
uint64_t value() const;
operator uint64_t() const { return value(); }
operator uint64_t() const { return value(); }
float milliseconds() const { return value() / 1.0e6; }
float seconds() const { return milliseconds() / 1000.f; }
protected:
uint64_t ticks;

13
src/cryptonote_core/blockchain.cpp
View file

@ -608,8 +608,19 @@ void Blockchain::pop_blocks(uint64_t nblocks)
const uint64_t blockchain_height = m_db->height();
if (blockchain_height > 0)
nblocks = std::min(nblocks, blockchain_height - 1);
for (; i < nblocks; ++i)
uint64_t constexpr PERCENT_PER_PROGRESS_UPDATE = 10;
uint64_t const blocks_per_update = (nblocks / PERCENT_PER_PROGRESS_UPDATE);
tools::PerformanceTimer timer;
for (int progress = 0; i < nblocks; ++i)
{
if (nblocks >= BLOCKS_EXPECTED_IN_HOURS(24) && (i != 0 && (i % blocks_per_update == 0)))
{
MGINFO("... popping blocks " << (++progress * PERCENT_PER_PROGRESS_UPDATE) << "% completed, height: " << (blockchain_height - i) << " (" << timer.seconds() << "s)");
timer.reset();
}
pop_block_from_blockchain();
}
}