Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-08 01:22:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2457

Browse source 
d2d8a41c Use actual batch size for resize estimates (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-09-25 16:57:07 +02:00
commit e5a2cdbfad
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
8 changed files with 135 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/cryptonote_core/blockchain.cpp
View file

@ -3732,6 +3732,7 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
MTRACE("Blockchain::" << __func__);
TIME_MEASURE_START(prepare);
bool stop_batch;
uint64_t bytes = 0;
// Order of locking must be:
// m_incoming_tx_lock (optional)
@ -3753,7 +3754,15 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
if(blocks_entry.size() == 0)
return false;
while (!(stop_batch = m_db->batch_start(blocks_entry.size()))) {
for (const auto &entry : blocks_entry)
{
bytes += entry.block.size();
for (const auto &tx_blob : entry.txs)
{
bytes += tx_blob.size();
}
}
while (!(stop_batch = m_db->batch_start(blocks_entry.size(), bytes))) {
m_blockchain_lock.unlock();
m_tx_pool.unlock();
epee::misc_utils::sleep_no_w(1000);