Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4487 

7c790f11 Fix rtxn usage in BlockchainLMDB::get_estimated_batch_size (Howard Chu)
This commit is contained in:
Riccardo Spagni 2018-10-05 23:12:11 +02:00
parent 735a33e8d8
commit 5adbede27f
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/blockchain_db/lmdb/db_lmdb.cpp
View File

@ -649,7 +649,7 @@ uint64_t BlockchainLMDB::get_estimated_batch_size(uint64_t batch_num_blocks, uin
{ {
MDB_txn *rtxn; MDB_txn *rtxn;
mdb_txn_cursors *rcurs; mdb_txn_cursors *rcurs;
block_rtxn_start(&rtxn, &rcurs); bool my_rtxn = block_rtxn_start(&rtxn, &rcurs);
for (uint64_t block_num = block_start; block_num <= block_stop; ++block_num) for (uint64_t block_num = block_start; block_num <= block_stop; ++block_num)
{ {
// we have access to block weight, which will be greater or equal to block size, // we have access to block weight, which will be greater or equal to block size,
@ -661,7 +661,7 @@ uint64_t BlockchainLMDB::get_estimated_batch_size(uint64_t batch_num_blocks, uin
// some blocks were to be skipped for being outliers. // some blocks were to be skipped for being outliers.
++num_blocks_used; ++num_blocks_used;
} }
block_rtxn_stop(); if (my_rtxn) block_rtxn_stop();
avg_block_size = total_block_size / num_blocks_used; avg_block_size = total_block_size / num_blocks_used;
MDEBUG("average block size across recent " << num_blocks_used << " blocks: " << avg_block_size); MDEBUG("average block size across recent " << num_blocks_used << " blocks: " << avg_block_size);
} }