nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1022

Browse Source 
b8c03a5 Remove blocks_per_sync limits (Howard Chu)
This commit is contained in:
Riccardo Spagni 2016-09-01 11:32:27 +02:00
commit e0d78858e4
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/blockchain.cpp
View File

@ -3374,7 +3374,7 @@ bool Blockchain::cleanup_handle_incoming_blocks(bool force_sync)
store_blockchain(); store_blockchain();
m_sync_counter = 0; m_sync_counter = 0;
} }
else if (m_sync_counter >= m_db_blocks_per_sync) else if (m_db_blocks_per_sync && m_sync_counter >= m_db_blocks_per_sync)
{ {
if(m_db_sync_mode == db_async) if(m_db_sync_mode == db_async)
{ {

9
src/cryptonote_core/cryptonote_core.cpp
View File

@ -372,11 +372,10 @@ namespace cryptonote
if(options.size() >= 3 && !safemode) if(options.size() >= 3 && !safemode)
{ {
blocks_per_sync = atoll(options[2].c_str()); char *endptr;
if(blocks_per_sync > 5000) uint64_t bps = strtoull(options[2].c_str(), &endptr, 0);
blocks_per_sync = 5000; if (*endptr == '\0')
if(blocks_per_sync == 0) blocks_per_sync = bps;
blocks_per_sync = 1;
} }
bool auto_remove_logs = command_line::get_arg(vm, command_line::arg_db_auto_remove_logs) != 0; bool auto_remove_logs = command_line::get_arg(vm, command_line::arg_db_auto_remove_logs) != 0;