cryptonote_protocol: large block sync size before v4

This commit is contained in:
moneromooo-monero 2017-08-16 21:19:53 +01:00
parent 7b74760756
commit 5a283078ec
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
7 changed files with 17 additions and 8 deletions

View File

@ -129,8 +129,8 @@ namespace command_line
}; };
const command_line::arg_descriptor<size_t> arg_block_sync_size = { const command_line::arg_descriptor<size_t> arg_block_sync_size = {
"block-sync-size" "block-sync-size"
, "How many blocks to sync at once during chain synchronization." , "How many blocks to sync at once during chain synchronization (0 = adaptive)."
, BLOCKS_SYNCHRONIZING_DEFAULT_COUNT , 0
}; };
const command_line::arg_descriptor<std::string> arg_check_updates = { const command_line::arg_descriptor<std::string> arg_check_updates = {
"check-updates" "check-updates"

View File

@ -89,6 +89,7 @@
#define BLOCKS_IDS_SYNCHRONIZING_DEFAULT_COUNT 10000 //by default, blocks ids count in synchronizing #define BLOCKS_IDS_SYNCHRONIZING_DEFAULT_COUNT 10000 //by default, blocks ids count in synchronizing
#define BLOCKS_SYNCHRONIZING_DEFAULT_COUNT_PRE_V4 100 //by default, blocks count in blocks downloading
#define BLOCKS_SYNCHRONIZING_DEFAULT_COUNT 20 //by default, blocks count in blocks downloading #define BLOCKS_SYNCHRONIZING_DEFAULT_COUNT 20 //by default, blocks count in blocks downloading
#define CRYPTONOTE_PROTOCOL_HOP_RELAX_COUNT 3 //value of hop, after which we use only announce of new block #define CRYPTONOTE_PROTOCOL_HOP_RELAX_COUNT 3 //value of hop, after which we use only announce of new block

View File

@ -421,8 +421,6 @@ namespace cryptonote
CHECK_AND_ASSERT_MES(r, false, "Failed to initialize blockchain storage"); CHECK_AND_ASSERT_MES(r, false, "Failed to initialize blockchain storage");
block_sync_size = command_line::get_arg(vm, command_line::arg_block_sync_size); block_sync_size = command_line::get_arg(vm, command_line::arg_block_sync_size);
if (block_sync_size == 0)
block_sync_size = BLOCKS_SYNCHRONIZING_DEFAULT_COUNT;
MGINFO("Loading checkpoints"); MGINFO("Loading checkpoints");
@ -788,6 +786,16 @@ namespace cryptonote
return true; return true;
} }
//----------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------
size_t core::get_block_sync_size(uint64_t height) const
{
static const uint64_t quick_height = m_testnet ? 801219 : 1220516;
if (block_sync_size > 0)
return block_sync_size;
if (height >= quick_height)
return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT;
return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT_PRE_V4;
}
//-----------------------------------------------------------------------------------------------
std::pair<uint64_t, uint64_t> core::get_coinbase_tx_sum(const uint64_t start_offset, const size_t count) std::pair<uint64_t, uint64_t> core::get_coinbase_tx_sum(const uint64_t start_offset, const size_t count)
{ {
uint64_t emission_amount = 0; uint64_t emission_amount = 0;

View File

@ -691,7 +691,7 @@ namespace cryptonote
* *
* @return the number of blocks to sync in one go * @return the number of blocks to sync in one go
*/ */
size_t get_block_sync_size() const { return block_sync_size; } size_t get_block_sync_size(uint64_t height) const;
/** /**
* @brief get the sum of coinbase tx amounts between blocks * @brief get the sum of coinbase tx amounts between blocks

View File

@ -1286,7 +1286,7 @@ skip:
NOTIFY_REQUEST_GET_OBJECTS::request req; NOTIFY_REQUEST_GET_OBJECTS::request req;
bool is_next = false; bool is_next = false;
size_t count = 0; size_t count = 0;
const size_t count_limit = m_core.get_block_sync_size(); const size_t count_limit = m_core.get_block_sync_size(m_core.get_current_blockchain_height());
std::pair<uint64_t, uint64_t> span = std::make_pair(0, 0); std::pair<uint64_t, uint64_t> span = std::make_pair(0, 0);
if (force_next_span) if (force_next_span)
{ {

View File

@ -88,7 +88,7 @@ namespace tests
bool prepare_handle_incoming_blocks(const std::list<cryptonote::block_complete_entry> &blocks) { return true; } bool prepare_handle_incoming_blocks(const std::list<cryptonote::block_complete_entry> &blocks) { return true; }
bool cleanup_handle_incoming_blocks(bool force_sync = false) { return true; } bool cleanup_handle_incoming_blocks(bool force_sync = false) { return true; }
uint64_t get_target_blockchain_height() const { return 1; } uint64_t get_target_blockchain_height() const { return 1; }
size_t get_block_sync_size() const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; } size_t get_block_sync_size(uint64_t height) const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; }
virtual void on_transaction_relayed(const cryptonote::blobdata& tx) {} virtual void on_transaction_relayed(const cryptonote::blobdata& tx) {}
bool get_testnet() const { return false; } bool get_testnet() const { return false; }
bool get_pool_transaction(const crypto::hash& id, cryptonote::blobdata& tx_blob) const { return false; } bool get_pool_transaction(const crypto::hash& id, cryptonote::blobdata& tx_blob) const { return false; }

View File

@ -65,7 +65,7 @@ public:
bool prepare_handle_incoming_blocks(const std::list<cryptonote::block_complete_entry> &blocks) { return true; } bool prepare_handle_incoming_blocks(const std::list<cryptonote::block_complete_entry> &blocks) { return true; }
bool cleanup_handle_incoming_blocks(bool force_sync = false) { return true; } bool cleanup_handle_incoming_blocks(bool force_sync = false) { return true; }
uint64_t get_target_blockchain_height() const { return 1; } uint64_t get_target_blockchain_height() const { return 1; }
size_t get_block_sync_size() const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; } size_t get_block_sync_size(uint64_t height) const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; }
virtual void on_transaction_relayed(const cryptonote::blobdata& tx) {} virtual void on_transaction_relayed(const cryptonote::blobdata& tx) {}
bool get_testnet() const { return false; } bool get_testnet() const { return false; }
bool get_pool_transaction(const crypto::hash& id, cryptonote::blobdata& tx_blob) const { return false; } bool get_pool_transaction(const crypto::hash& id, cryptonote::blobdata& tx_blob) const { return false; }