diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-01 11:32:27 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-01 11:32:27 +0200 |
| commit | e0d78858e485b3cb393a4aec0873f80ce1e24e23 (patch) | |
| tree | 7f3a612b048e5df2a3407356df76e8f3f579fd33 | |
| parent | Merge pull request #1027 (diff) | |
| parent | Remove blocks_per_sync limits (diff) | |
| download | monero-e0d78858e485b3cb393a4aec0873f80ce1e24e23.tar.xz | |
Merge pull request #1022
b8c03a5 Remove blocks_per_sync limits (Howard Chu)
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 | ||||
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index dd9c21b91..b15eb4b90 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -3374,7 +3374,7 @@ bool Blockchain::cleanup_handle_incoming_blocks(bool force_sync) store_blockchain(); 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) { diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 73edde1b7..f5445b48a 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -372,11 +372,10 @@ namespace cryptonote if(options.size() >= 3 && !safemode) { - blocks_per_sync = atoll(options[2].c_str()); - if(blocks_per_sync > 5000) - blocks_per_sync = 5000; - if(blocks_per_sync == 0) - blocks_per_sync = 1; + char *endptr; + uint64_t bps = strtoull(options[2].c_str(), &endptr, 0); + if (*endptr == '\0') + blocks_per_sync = bps; } bool auto_remove_logs = command_line::get_arg(vm, command_line::arg_db_auto_remove_logs) != 0; |