kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make fast_refresh interruptible

Browse source
This commit is contained in:
Howard Chu 2016-04-29 06:21:08 +01:00
parent 687855d658
commit 590c43988c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wallet/wallet2.cpp
View file

@ -796,7 +796,8 @@ void wallet2::fast_refresh(uint64_t stop_height, uint64_t &blocks_start_height,
{ {
std::list<crypto::hash> hashes; std::list<crypto::hash> hashes;
size_t current_index = m_blockchain.size(); size_t current_index = m_blockchain.size();
while(current_index < stop_height)
while(m_run.load(std::memory_order_relaxed) && current_index < stop_height)
{ {
pull_hashes(0, blocks_start_height, short_chain_history, hashes); pull_hashes(0, blocks_start_height, short_chain_history, hashes);
if (hashes.size() < 3) if (hashes.size() < 3)
@ -860,6 +861,7 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
// pull the first set of blocks // pull the first set of blocks
get_short_chain_history(short_chain_history); get_short_chain_history(short_chain_history);
m_run.store(true, std::memory_order_relaxed);
if (start_height > m_blockchain.size() || m_refresh_from_block_height > m_blockchain.size()) { if (start_height > m_blockchain.size() || m_refresh_from_block_height > m_blockchain.size()) {
if (!start_height) if (!start_height)
start_height = m_refresh_from_block_height; start_height = m_refresh_from_block_height;
@ -877,7 +879,6 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
// subsequent pulls in this refresh. // subsequent pulls in this refresh.
start_height = 0; start_height = 0;
m_run.store(true, std::memory_order_relaxed);
while(m_run.load(std::memory_order_relaxed)) while(m_run.load(std::memory_order_relaxed))
{ {
try try