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

blockchain: cap memory size of retrieved blocks

Browse source 
It helps keep memory usage down when a wallet refreshes through
a string of large blocks
This commit is contained in:
moneromooo-monero 2017-08-25 21:04:55 +01:00
parent 20bedf320e
commit 2d8a6a6f0c
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cryptonote_core/blockchain.cpp
View file

@ -59,6 +59,8 @@
#undef MONERO_DEFAULT_LOG_CATEGORY #undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "blockchain" #define MONERO_DEFAULT_LOG_CATEGORY "blockchain"
#define FIND_BLOCKCHAIN_SUPPLEMENT_MAX_SIZE (100*1024*1024) // 100 MB
//#include "serialization/json_archive.h" //#include "serialization/json_archive.h"
/* TODO: /* TODO:
@ -2075,8 +2077,8 @@ bool Blockchain::find_blockchain_supplement(const uint64_t req_start_block, cons
m_db->block_txn_start(true); m_db->block_txn_start(true);
total_height = get_current_blockchain_height(); total_height = get_current_blockchain_height();
size_t count = 0; size_t count = 0, size = 0;
for(size_t i = start_height; i < total_height && count < max_count; i++, count++) for(size_t i = start_height; i < total_height && count < max_count && (size < FIND_BLOCKCHAIN_SUPPLEMENT_MAX_SIZE || count < 3); i++, count++)
{ {
blocks.resize(blocks.size()+1); blocks.resize(blocks.size()+1);
blocks.back().first = m_db->get_block_blob_from_height(i); blocks.back().first = m_db->get_block_blob_from_height(i);
@ -2085,6 +2087,9 @@ bool Blockchain::find_blockchain_supplement(const uint64_t req_start_block, cons
std::list<crypto::hash> mis; std::list<crypto::hash> mis;
get_transactions_blobs(b.tx_hashes, blocks.back().second, mis); get_transactions_blobs(b.tx_hashes, blocks.back().second, mis);
CHECK_AND_ASSERT_MES(!mis.size(), false, "internal error, transaction from block not found"); CHECK_AND_ASSERT_MES(!mis.size(), false, "internal error, transaction from block not found");
size += blocks.back().first.size();
for (const auto &t: blocks.back().second)
size += t.size();
} }
m_db->block_txn_stop(); m_db->block_txn_stop();
return true; return true;