monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #732

Browse source 
db1b2db Reduce log noise (Howard Chu)
9b3e43c Fix issue #706 (Howard Chu)
This commit is contained in:
Riccardo Spagni 2016-03-19 15:27:02 +02:00
commit d7fb03fc97
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/blockchain_db/lmdb/db_lmdb.cpp
View file

@ -240,6 +240,8 @@ mdb_txn_safe::mdb_txn_safe(const bool check) : m_txn(NULL), m_tinfo(NULL), m_che
mdb_txn_safe::~mdb_txn_safe() mdb_txn_safe::~mdb_txn_safe()
{ {
if (!m_check)
return;
LOG_PRINT_L3("mdb_txn_safe: destructor"); LOG_PRINT_L3("mdb_txn_safe: destructor");
if (m_tinfo != nullptr) if (m_tinfo != nullptr)
{ {
@ -263,7 +265,6 @@ mdb_txn_safe::~mdb_txn_safe()
} }
mdb_txn_abort(m_txn); mdb_txn_abort(m_txn);
} }
if (m_check)
num_active_txns--; num_active_txns--;
} }

1
src/cryptonote_core/blockchain.cpp
View file

@ -2798,6 +2798,7 @@ void Blockchain::check_against_checkpoints(const checkpoints& points, bool enfor
{ {
const auto& pts = points.get_points(); const auto& pts = points.get_points();
CRITICAL_REGION_LOCAL(m_blockchain_lock);
m_db->batch_start(); m_db->batch_start();
for (const auto& pt : pts) for (const auto& pt : pts)
{ {