gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-16 23:01:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix delayed exit when syncing

Browse Source
This commit is contained in:
moneromooo-monero
2016-12-04 12:27:45 +00:00
parent c36cb54340
commit 3f7d6fb57d
6 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/cryptonote_core/blockchain.cpp
View File

@@ -118,7 +118,7 @@ static const uint64_t testnet_hard_fork_version_1_till = 624633;
//------------------------------------------------------------------
Blockchain::Blockchain(tx_memory_pool& tx_pool) :
m_db(), m_tx_pool(tx_pool), m_hardfork(NULL), m_timestamps_and_difficulties_height(0), m_current_block_cumul_sz_limit(0), m_is_in_checkpoint_zone(false),
m_is_blockchain_storing(false), m_enforce_dns_checkpoints(false), m_max_prepare_blocks_threads(4), m_db_blocks_per_sync(1), m_db_sync_mode(db_async), m_fast_sync(true), m_show_time_stats(false), m_sync_counter(0)
m_is_blockchain_storing(false), m_enforce_dns_checkpoints(false), m_max_prepare_blocks_threads(4), m_db_blocks_per_sync(1), m_db_sync_mode(db_async), m_fast_sync(true), m_show_time_stats(false), m_sync_counter(0), m_cancel(false)
{
LOG_PRINT_L3("Blockchain::" << __func__);
}
@@ -3436,6 +3436,8 @@ void Blockchain::block_longhash_worker(const uint64_t height, const std::vector<
// the height of the block passed to it
for (const auto & block : blocks)
{
if (m_cancel)
return;
crypto::hash id = get_block_hash(block);
crypto::hash pow = get_block_longhash(block, height);
map.emplace(id, pow);
@@ -3611,6 +3613,9 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
thread_list.clear();
if (m_cancel)
return false;
for (const auto & map : maps)
{
m_blocks_longhash_table.insert(map.begin(), map.end());
@@ -3618,6 +3623,9 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
}
}
if (m_cancel)
return false;
if (blocks_exist)
{
LOG_PRINT_L0("Skipping prepare blocks. Blocks exist.");
@@ -3655,6 +3663,9 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
// generate sorted tables for all amounts and absolute offsets
for (const auto &entry : blocks_entry)
{
if (m_cancel)
return false;
for (const auto &tx_blob : entry.txs)
{
crypto::hash tx_hash = null_hash;
@@ -3763,6 +3774,9 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
// now generate a table for each tx_prefix and k_image hashes
for (const auto &entry : blocks_entry)
{
if (m_cancel)
return false;
for (const auto &tx_blob : entry.txs)
{
crypto::hash tx_hash = null_hash;
@@ -3844,6 +3858,11 @@ std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> Blockchain:: get_ou
return m_db->get_output_histogram(amounts, unlocked, recent_cutoff);
}
void Blockchain::cancel()
{
m_cancel = true;
}
#if defined(PER_BLOCK_CHECKPOINT)
void Blockchain::load_compiled_in_block_hashes()
{