Merge pull request libbitcoin#145 from evoskuil/version3

Make block index read atomic.
fibercrypto · May 18, 2017 · 9057e17 · 9057e17
2 parents b3e2ae8 + 0c145c3
commit 9057e17
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/databases/block_database.cpp b/src/databases/block_database.cpp
@@ -280,7 +280,12 @@ void block_database::write_position(file_offset position, array_index height)
 file_offset block_database::read_position(array_index height) const
 {
     const auto slab = index_manager_.get(height);
+
+    // Critical Section
+    ///////////////////////////////////////////////////////////////////////////
+    shared_lock lock(mutex_);
     return from_little_endian_unsafe<file_offset>(REMAP_ADDRESS(slab));
+    ///////////////////////////////////////////////////////////////////////////
 }
 
 // The index of the highest existing block, independent of gaps.

diff --git a/src/databases/transaction_database.cpp b/src/databases/transaction_database.cpp
@@ -136,8 +136,8 @@ memory_ptr transaction_database::find(const hash_digest& hash,
     ///////////////////////////////////////////////////////////////////////////
     // Critical Section
     metadata_mutex_.lock_shared();
-    const size_t height = deserial.read_4_bytes_little_endian();
-    const size_t position = deserial.read_2_bytes_little_endian();
+    const auto height = deserial.read_4_bytes_little_endian();
+    const auto position = deserial.read_2_bytes_little_endian();
     metadata_mutex_.unlock_shared();
     ///////////////////////////////////////////////////////////////////////////
 
@@ -158,7 +158,7 @@ transaction_result transaction_database::get(const hash_digest& hash,
         metadata_mutex_.lock_shared();
         auto deserial = make_unsafe_deserializer(REMAP_ADDRESS(slab));
         const auto height = deserial.read_4_bytes_little_endian();
-        const auto position = deserial.read_4_bytes_little_endian();
+        const auto position = deserial.read_2_bytes_little_endian();
         metadata_mutex_.unlock_shared();
         ///////////////////////////////////////////////////////////////////////
 
@@ -185,7 +185,7 @@ bool transaction_database::get_output(output& out_output, size_t& out_height,
         metadata_mutex_.lock_shared();
         auto deserial = make_unsafe_deserializer(REMAP_ADDRESS(slab));
         const auto height = deserial.read_4_bytes_little_endian();
-        const auto position = deserial.read_4_bytes_little_endian();
+        const auto position = deserial.read_2_bytes_little_endian();
         metadata_mutex_.unlock_shared();
         ///////////////////////////////////////////////////////////////////////