add support for parallel execute solidity contract

leowei1234567 · Mar 18, 2019 · 3bbcba3 · 3bbcba3
1 parent 7f83a0d
commit 3bbcba3
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 18 deletions.
diff --git a/libblockverifier/ExecutiveContext.cpp b/libblockverifier/ExecutiveContext.cpp
@@ -196,9 +196,10 @@ std::shared_ptr<std::vector<std::string>> ExecutiveContext::getTxCriticals(const
                 ContractABI abi;
                 string c0, c1;
                 abi.abiOut(data, c0, c1);
+                /*
                 LOG(DEBUG) << LOG_BADGE("PARA") << LOG_DESC("Get normal transaction criticals")
                            << LOG_KV("c0", c0) << LOG_KV("c1", c1);
-
+*/
                 auto res = make_shared<vector<string>>();
                 res->emplace_back(c0);
                 res->emplace_back(c1);

diff --git a/libexecutive/StateFace.h b/libexecutive/StateFace.h
@@ -107,7 +107,7 @@ class StateFace
     /// @returns bytes() if no account exists at that address.
     /// @warning The reference to the code is only valid until the access to
     ///          other account. Do not keep it.
-    virtual bytes const& code(Address const& _addr) const = 0;
+    virtual bytes const code(Address const& _addr) const = 0;
 
     /// Get the code hash of an account.
     /// @returns EmptySHA3 if no account exists at that address or if there is no code associated

diff --git a/libmptstate/MPTState.cpp b/libmptstate/MPTState.cpp
@@ -110,7 +110,7 @@ void MPTState::kill(Address _a)
     m_state.kill(_a);
 }
 
-bytes const& MPTState::code(Address const& _addr) const
+bytes const MPTState::code(Address const& _addr) const
 {
     return m_state.code(_addr);
 }

diff --git a/libmptstate/MPTState.h b/libmptstate/MPTState.h
@@ -96,7 +96,7 @@ class MPTState : public dev::executive::StateFace
     // virtual std::map<h256, std::pair<u256, u256>> storage(Address const& _contract) const
     // override;
 
-    virtual bytes const& code(Address const& _addr) const override;
+    virtual bytes const code(Address const& _addr) const override;
 
     virtual h256 codeHash(Address const& _contract) const override;
 

diff --git a/libstorage/MemoryTableFactory.cpp b/libstorage/MemoryTableFactory.cpp
@@ -51,6 +51,7 @@ MemoryTableFactory::MemoryTableFactory() : m_blockHash(h256(0)), m_blockNum(0)
 Table::Ptr MemoryTableFactory::openTable(
     const std::string& tableName, bool authorityFlag, bool isPara)
 {
+    RecursiveGuard l(x_name2Table);
     auto it = m_name2Table.find(tableName);
     if (it != m_name2Table.end())
     {

diff --git a/libstorage/MemoryTableFactory.h b/libstorage/MemoryTableFactory.h
@@ -45,10 +45,10 @@ class MemoryTableFactory : public StateDBFactory
     MemoryTableFactory();
     virtual ~MemoryTableFactory() {}
     virtual Table::Ptr openTable(
-        const std::string& tableName, bool authorityFlag = true, bool isPara = false);
+        const std::string& tableName, bool authorityFlag = true, bool isPara = true);
     virtual Table::Ptr createTable(const std::string& tableName, const std::string& keyField,
         const std::string& valueField, bool authorityFlag = true,
-        Address const& _origin = Address(), bool isPara = false);
+        Address const& _origin = Address(), bool isPara = true);
 
     virtual Storage::Ptr stateStorage() { return m_stateStorage; }
     virtual void setStateStorage(Storage::Ptr stateStorage) { m_stateStorage = stateStorage; }
@@ -75,6 +75,9 @@ class MemoryTableFactory : public StateDBFactory
     h256 m_hash;
     std::vector<std::string> m_sysTables;
     int createTableCode;
+
+    // mutex
+    mutable RecursiveMutex x_name2Table;
 };
 
 }  // namespace storage

diff --git a/libstoragestate/CMakeLists.txt b/libstoragestate/CMakeLists.txt
@@ -3,4 +3,4 @@ file(GLOB HEADERS "*.h")
 
 add_library(storagestate ${SRC_LIST} ${HEADERS})
 
-target_link_libraries(storagestate PUBLIC storage devcrypto)
+target_link_libraries(storagestate PUBLIC storage devcrypto TBB)
diff --git a/libstoragestate/StorageState.cpp b/libstoragestate/StorageState.cpp
@@ -223,7 +223,6 @@ void StorageState::setCode(Address const& _address, bytes&& _code)
         entry->setField(STORAGE_VALUE, toHex(sha3(_code)));
         table->update(ACCOUNT_CODE_HASH, entry, table->newCondition());
     }
-    m_cache[_address] = _code;
 }
 
 void StorageState::kill(Address _address)
@@ -250,11 +249,8 @@ void StorageState::kill(Address _address)
     clear();
 }
 
-bytes const& StorageState::code(Address const& _address) const
+bytes const StorageState::code(Address const& _address) const
 {
-    auto it = m_cache.find(_address);
-    if (it != m_cache.end())
-        return it->second;
     if (codeHash(_address) == EmptySHA3)
         return NullBytes;
     auto table = getTable(_address);
@@ -263,8 +259,7 @@ bytes const& StorageState::code(Address const& _address) const
         auto entries = table->select(ACCOUNT_CODE, table->newCondition());
         if (entries->size() != 0u)
         {
-            m_cache[_address] = fromHex(entries->get(0)->getField(STORAGE_VALUE));
-            return m_cache[_address];
+            return fromHex(entries->get(0)->getField(STORAGE_VALUE));
         }
     }
     return NullBytes;
@@ -397,7 +392,7 @@ void StorageState::rollback(size_t _savepoint)
 
 void StorageState::clear()
 {
-    m_cache.clear();
+    // m_cache.clear();
 }
 
 bool StorageState::checkAuthority(Address const& _origin, Address const& _contract) const

diff --git a/libstoragestate/StorageState.h b/libstoragestate/StorageState.h
@@ -25,6 +25,8 @@
 #pragma once
 #include "libexecutive/StateFace.h"
 #include <libstorage/MemoryTableFactory.h>
+#include <tbb/concurrent_unordered_map.h>
+#include <string>
 
 namespace dev
 {
@@ -37,6 +39,7 @@ const char* const ACCOUNT_CODE_HASH = "codeHash";
 const char* const ACCOUNT_CODE = "code";
 const char* const ACCOUNT_NONCE = "nonce";
 const char* const ACCOUNT_ALIVE = "alive";
+
 class StorageState : public dev::executive::StateFace
 {
 public:
@@ -113,7 +116,7 @@ class StorageState : public dev::executive::StateFace
     /// @returns bytes() if no account exists at that address.
     /// @warning The reference to the code is only valid until the access to
     ///          other account. Do not keep it.
-    virtual bytes const& code(Address const& _address) const override;
+    virtual bytes const code(Address const& _address) const override;
 
     /// Get the code hash of an account.
     /// @returns EmptySHA3 if no account exists at that address or if there is no code associated
@@ -172,7 +175,6 @@ class StorageState : public dev::executive::StateFace
     }
 
 private:
-    mutable std::unordered_map<Address, bytes> m_cache;
     void createAccount(Address const& _address, u256 const& _nonce, u256 const& _amount = u256(0));
     std::shared_ptr<dev::storage::Table> getTable(Address const& _address) const;
     /// check authority by caller

diff --git a/tools/build_chain.sh b/tools/build_chain.sh
@@ -495,7 +495,7 @@ function generate_group_ini()
     ;ttl=2
 ;txpool limit
 [tx_pool]
-    limit=10000
+    limit=150000
 [tx_execute]
     enable_parallel=true
 EOF
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@ file(GLOB HEADERS "*.h")

		add_library(storagestate ${SRC_LIST} ${HEADERS})

		target_link_libraries(storagestate PUBLIC storage devcrypto)
		target_link_libraries(storagestate PUBLIC storage devcrypto TBB)