Merge pull request #285 from graft-project/fix/deadlock-1.7.5

deadlock fix. Cherry-picked from community branch
graft-project · May 1, 2019 · 0623a5f · 0623a5f
2 parents 91511ea + ebab090
commit 0623a5f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ Dates are provided in the format YYYY-MM-DD.
 | 2018-09-17        | v10               | 1.4.4                | 1.4.5                    | Block reward halved       |
 | 2018-10-31        | v11               | 1.5.0                | 1.5.1                    | PoW algorithm from Monero v8 (CN v2), enabled checkpoints for mainnet  |
 | 2019-03-07        | v12               | 1.6.0                | 1.6.0                    | Own PoW algorithm - CryptoNight V8 ReverseWaltz - tweaked from CryptoNight Monero v8 (CN v2)  |
-| 2019-03-20        | v13               | 1.7.5                | 1.7.5                    | RTA Mining  |
+| 2019-03-20        | v13               | 1.7.6                | 1.7.6                    | RTA Mining  |
 
 ## Installing Graft Network from a Package
 

diff --git a/contrib/epee/include/syncobj.h b/contrib/epee/include/syncobj.h
@@ -112,6 +112,11 @@ namespace epee
       return m_section.try_lock();
     }
 
+    bool try_lock()
+    {
+      return tryLock();
+    }
+
     // to make copy fake
     critical_section& operator=(const critical_section& section)
     {

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
@@ -4334,6 +4334,11 @@ void Blockchain::unlock()
   m_blockchain_lock.unlock();
 }
 
+bool Blockchain::try_lock()
+{
+  return m_blockchain_lock.tryLock();
+}
+
 bool Blockchain::for_all_key_images(std::function<bool(const crypto::key_image&)> f) const
 {
   return m_db->for_all_key_images(f);

diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h
@@ -900,6 +900,7 @@ namespace cryptonote
 
     void lock();
     void unlock();
+    bool try_lock();
 
     void cancel();
 

diff --git a/src/cryptonote_core/stake_transaction_processor.cpp b/src/cryptonote_core/stake_transaction_processor.cpp
@@ -283,7 +283,9 @@ void StakeTransactionProcessor::process_block(uint64_t block_index, const block&
 
 void StakeTransactionProcessor::synchronize()
 {
-  CRITICAL_REGION_LOCAL1(m_storage_lock);
+  std::unique_lock<epee::critical_section> storage_lock{m_storage_lock, std::defer_lock};
+  std::unique_lock<Blockchain> blockchain_lock{m_blockchain, std::defer_lock};
+  std::lock(storage_lock, blockchain_lock);
 
   uint64_t height = m_blockchain.get_current_blockchain_height();
 

diff --git a/src/version.h.in b/src/version.h.in
@@ -1,4 +1,4 @@
 #define GRAFT_VERSION_TAG "@VERSIONTAG@"
-#define GRAFT_VERSION "1.7.5"
+#define GRAFT_VERSION "1.7.6"
 #define GRAFT_RELEASE_NAME "Delta Velorum"
 #define GRAFT_VERSION_FULL GRAFT_VERSION "-" GRAFT_VERSION_TAG