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

Try to not pollute cryptonote namespace

Browse source
This commit is contained in:
Thomas Winget 2015-03-14 17:24:51 -04:00
parent edef0bb771
commit 5112dc37d7
No known key found for this signature in database
GPG key ID: 58131A160789E630
2 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -553,7 +553,7 @@ uint64_t BlockchainLMDB::get_output_global_index(const uint64_t& amount, const u
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -665,7 +665,7 @@ void BlockchainLMDB::open(const std::string& filename)
throw0(DB_ERROR(std::string("Failed to open lmdb environment: ").append(mdb_strerror(result)).c_str())); throw0(DB_ERROR(std::string("Failed to open lmdb environment: ").append(mdb_strerror(result)).c_str()));
// get a read/write MDB_txn // get a read/write MDB_txn
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, 0, txn)) if (mdb_txn_begin(m_env, NULL, 0, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -802,7 +802,7 @@ bool BlockchainLMDB::block_exists(const crypto::hash& h) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -835,7 +835,7 @@ uint64_t BlockchainLMDB::get_block_height(const crypto::hash& h) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -865,7 +865,7 @@ block BlockchainLMDB::get_block_from_height(const uint64_t& height) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -896,8 +896,8 @@ uint64_t BlockchainLMDB::get_block_timestamp(const uint64_t& height) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -939,8 +939,8 @@ size_t BlockchainLMDB::get_block_size(const uint64_t& height) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -969,8 +969,8 @@ difficulty_type BlockchainLMDB::get_block_cumulative_difficulty(const uint64_t&
LOG_PRINT_L3("BlockchainLMDB::" << __func__ << " height: " << height); LOG_PRINT_L3("BlockchainLMDB::" << __func__ << " height: " << height);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -1015,8 +1015,8 @@ uint64_t BlockchainLMDB::get_block_already_generated_coins(const uint64_t& heigh
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -1045,8 +1045,8 @@ crypto::hash BlockchainLMDB::get_block_hash_from_height(const uint64_t& height)
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -1138,8 +1138,8 @@ bool BlockchainLMDB::tx_exists(const crypto::hash& h) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -1173,7 +1173,7 @@ uint64_t BlockchainLMDB::get_tx_unlock_time(const crypto::hash& h) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -1193,8 +1193,8 @@ transaction BlockchainLMDB::get_tx(const crypto::hash& h) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -1228,7 +1228,7 @@ uint64_t BlockchainLMDB::get_tx_count() const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -1268,8 +1268,8 @@ uint64_t BlockchainLMDB::get_tx_block_height(const crypto::hash& h) const
// read transaction here, as validation is done prior to the write for block // read transaction here, as validation is done prior to the write for block
// and tx data. // and tx data.
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -1312,7 +1312,7 @@ uint64_t BlockchainLMDB::get_num_outputs(const uint64_t& amount) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -1343,7 +1343,7 @@ crypto::public_key BlockchainLMDB::get_output_key(const uint64_t& amount, const
uint64_t glob_index = get_output_global_index(amount, index); uint64_t glob_index = get_output_global_index(amount, index);
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -1363,7 +1363,7 @@ tx_out BlockchainLMDB::get_output(const crypto::hash& h, const uint64_t& index)
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -1408,7 +1408,7 @@ tx_out BlockchainLMDB::get_output(const uint64_t& index) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -1432,8 +1432,8 @@ tx_out_index BlockchainLMDB::get_output_tx_and_index_from_global(const uint64_t&
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -1468,8 +1468,8 @@ tx_out_index BlockchainLMDB::get_output_tx_and_index(const uint64_t& amount, con
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
txn_safe* txn_ptr = &txn; mdb_txn_safe* txn_ptr = &txn;
if (m_batch_active) if (m_batch_active)
txn_ptr = m_write_txn; txn_ptr = m_write_txn;
else else
@ -1518,7 +1518,7 @@ std::vector<uint64_t> BlockchainLMDB::get_tx_output_indices(const crypto::hash&
check_open(); check_open();
std::vector<uint64_t> index_vec; std::vector<uint64_t> index_vec;
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -1563,7 +1563,7 @@ std::vector<uint64_t> BlockchainLMDB::get_tx_amount_output_indices(const crypto:
transaction tx = get_tx(h); transaction tx = get_tx(h);
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -1634,7 +1634,7 @@ bool BlockchainLMDB::has_key_image(const crypto::key_image& img) const
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db")); throw0(DB_ERROR("Failed to create a transaction for the db"));
@ -1745,7 +1745,7 @@ uint64_t BlockchainLMDB::add_block( const block& blk
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (! m_batch_active) if (! m_batch_active)
{ {
if (mdb_txn_begin(m_env, NULL, 0, txn)) if (mdb_txn_begin(m_env, NULL, 0, txn))
@ -1783,7 +1783,7 @@ void BlockchainLMDB::pop_block(block& blk, std::vector<transaction>& txs)
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
txn_safe txn; mdb_txn_safe txn;
if (! m_batch_active) if (! m_batch_active)
{ {
if (mdb_txn_begin(m_env, NULL, 0, txn)) if (mdb_txn_begin(m_env, NULL, 0, txn))

22
src/blockchain_db/lmdb/db_lmdb.h
View file

@ -33,17 +33,17 @@
namespace cryptonote namespace cryptonote
{ {
struct txn_safe struct mdb_txn_safe
{ {
txn_safe() : m_txn(NULL) { } mdb_txn_safe() : m_txn(NULL) { }
~txn_safe() ~mdb_txn_safe()
{ {
LOG_PRINT_L3("txn_safe: destructor"); LOG_PRINT_L3("mdb_txn_safe: destructor");
if (m_txn != NULL) if (m_txn != NULL)
{ {
if (m_batch_txn) // this is a batch txn and should have been handled before this point for safety if (m_batch_txn) // this is a batch txn and should have been handled before this point for safety
{ {
LOG_PRINT_L0("WARNING: txn_safe: m_txn is a batch txn and it's not NULL in destructor - calling mdb_txn_abort()"); LOG_PRINT_L0("WARNING: mdb_txn_safe: m_txn is a batch txn and it's not NULL in destructor - calling mdb_txn_abort()");
} }
else else
{ {
@ -53,7 +53,7 @@ struct txn_safe
// //
// NOTE: not sure if this is ever reached for a non-batch write // NOTE: not sure if this is ever reached for a non-batch write
// transaction, but it's probably not ideal if it did. // transaction, but it's probably not ideal if it did.
LOG_PRINT_L3("txn_safe: m_txn not NULL in destructor - calling mdb_txn_abort()"); LOG_PRINT_L3("mdb_txn_safe: m_txn not NULL in destructor - calling mdb_txn_abort()");
} }
mdb_txn_abort(m_txn); mdb_txn_abort(m_txn);
} }
@ -77,11 +77,11 @@ struct txn_safe
// This should only be needed for batch transaction which must be ensured to // This should only be needed for batch transaction which must be ensured to
// be aborted before mdb_env_close, not after. So we can't rely on // be aborted before mdb_env_close, not after. So we can't rely on
// BlockchainLMDB destructor to call txn_safe destructor, as that's too late // BlockchainLMDB destructor to call mdb_txn_safe destructor, as that's too late
// to properly abort, since mdb_env_close would have been called earlier. // to properly abort, since mdb_env_close would have been called earlier.
void abort() void abort()
{ {
LOG_PRINT_L3("txn_safe: abort()"); LOG_PRINT_L3("mdb_txn_safe: abort()");
if(m_txn != NULL) if(m_txn != NULL)
{ {
mdb_txn_abort(m_txn); mdb_txn_abort(m_txn);
@ -89,7 +89,7 @@ struct txn_safe
} }
else else
{ {
LOG_PRINT_L0("WARNING: txn_safe: abort() called, but m_txn is NULL"); LOG_PRINT_L0("WARNING: mdb_txn_safe: abort() called, but m_txn is NULL");
} }
} }
@ -306,8 +306,8 @@ private:
uint64_t m_height; uint64_t m_height;
uint64_t m_num_outputs; uint64_t m_num_outputs;
std::string m_folder; std::string m_folder;
txn_safe* m_write_txn; // may point to either a short-lived txn or a batch txn mdb_txn_safe* m_write_txn; // may point to either a short-lived txn or a batch txn
txn_safe m_write_batch_txn; // persist batch txn outside of BlockchainLMDB mdb_txn_safe m_write_batch_txn; // persist batch txn outside of BlockchainLMDB
bool m_batch_transactions; // support for batch transactions bool m_batch_transactions; // support for batch transactions
bool m_batch_active; // whether batch transaction is in progress bool m_batch_active; // whether batch transaction is in progress