aboutsummaryrefslogtreecommitdiff
path: root/src/blockchain_db/lmdb
diff options
context:
space:
mode:
authorwarptangent <warptangent@tutanota.com>2016-02-08 08:32:19 -0800
committerwarptangent <warptangent@tutanota.com>2016-02-08 09:28:14 -0800
commitf3a60000946c86a42abbac3b8c4d9e6865b9cefb (patch)
tree49e5d37698726b59973585c8cf691979f23a7977 /src/blockchain_db/lmdb
parentBlockchainLMDB: Allow two HardFork functions to update DB during block add (diff)
downloadmonero-f3a60000946c86a42abbac3b8c4d9e6865b9cefb.tar.xz
BlockchainDB/LMDB/BDB: Extract DB txn functions for block add/remove
Diffstat (limited to 'src/blockchain_db/lmdb')
-rw-r--r--src/blockchain_db/lmdb/db_lmdb.cpp38
-rw-r--r--src/blockchain_db/lmdb/db_lmdb.h4
2 files changed, 42 insertions, 0 deletions
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index 401983f19..de82357b6 100644
--- a/src/blockchain_db/lmdb/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
@@ -2190,6 +2190,44 @@ void BlockchainLMDB::set_batch_transactions(bool batch_transactions)
LOG_PRINT_L3("batch transactions " << (m_batch_transactions ? "enabled" : "disabled"));
}
+void BlockchainLMDB::block_txn_start()
+{
+ LOG_PRINT_L3("BlockchainLMDB::" << __func__);
+ if (! m_batch_active && m_write_txn)
+ throw0(DB_ERROR((std::string("Attempted to start new write txn when write txn already exists in ")+__FUNCTION__).c_str()));
+ if (! m_batch_active)
+ {
+ m_write_txn = new mdb_txn_safe();
+ if (auto mdb_res = mdb_txn_begin(m_env, NULL, 0, *m_write_txn))
+ throw0(DB_ERROR(lmdb_error("Failed to create a transaction for the db: ", mdb_res).c_str()));
+ }
+}
+
+void BlockchainLMDB::block_txn_stop()
+{
+ LOG_PRINT_L3("BlockchainLMDB::" << __func__);
+ if (! m_batch_active)
+ {
+ TIME_MEASURE_START(time1);
+ m_write_txn->commit();
+ TIME_MEASURE_FINISH(time1);
+ time_commit1 += time1;
+
+ delete m_write_txn;
+ m_write_txn = NULL;
+ }
+}
+
+void BlockchainLMDB::block_txn_abort()
+{
+ LOG_PRINT_L3("BlockchainLMDB::" << __func__);
+ if (! m_batch_active)
+ {
+ delete m_write_txn;
+ m_write_txn = NULL;
+ }
+}
+
uint64_t BlockchainLMDB::add_block(const block& blk, const size_t& block_size, const difficulty_type& cumulative_difficulty, const uint64_t& coins_generated,
const std::vector<transaction>& txs)
{
diff --git a/src/blockchain_db/lmdb/db_lmdb.h b/src/blockchain_db/lmdb/db_lmdb.h
index eb0704ab2..e88bcd01b 100644
--- a/src/blockchain_db/lmdb/db_lmdb.h
+++ b/src/blockchain_db/lmdb/db_lmdb.h
@@ -194,6 +194,10 @@ public:
virtual void batch_stop();
virtual void batch_abort();
+ virtual void block_txn_start();
+ virtual void block_txn_stop();
+ virtual void block_txn_abort();
+
virtual void pop_block(block& blk, std::vector<transaction>& txs);
virtual bool can_thread_bulk_indices() const { return true; }