Threadsafe transaction queue.

Some repotting.

libethereum/BlockChain.cpp

@@ -35,10 +35,7 @@ using namespace eth;
 
 #define ETH_CATCH 1
 
-namespace eth
-{
-
-std::ostream& operator<<(std::ostream& _out, BlockChain const& _bc)
+std::ostream& eth::operator<<(std::ostream& _out, BlockChain const& _bc)
 {
 	string cmp = toBigEndianString(_bc.currentHash());
 	auto it = _bc.m_extrasDB->NewIterator(_bc.m_readOptions);
@@ -51,21 +48,6 @@ std::ostream& operator<<(std::ostream& _out, BlockChain const& _bc)
 	delete it;
 	return _out;
 }
-}
-
-BlockDetails::BlockDetails(RLP const& _r)
-{
-	number = _r[0].toInt<uint>();
-	totalDifficulty = _r[1].toInt<u256>();
-	parent = _r[2].toHash<h256>();
-	children = _r[3].toVector<h256>();
-	bloom = _r[4].toHash<h256>();
-}
-
-bytes BlockDetails::rlp() const
-{
-	return rlpList(number, totalDifficulty, parent, children, bloom);
-}
 
 std::map<Address, AddressState> const& eth::genesisState()
 {

libethereum/BlockChain.h

@@ -22,64 +22,17 @@
 #pragma once
 
 #include <mutex>
-#include <boost/thread.hpp>
 #include <libethential/Log.h>
 #include <libethcore/CommonEth.h>
 #include <libethcore/BlockInfo.h>
-#include "Manifest.h"
+#include "Guards.h"
+#include "BlockDetails.h"
 #include "AddressState.h"
 namespace ldb = leveldb;
 
 namespace eth
 {
 
-class RLP;
-class RLPStream;
-
-struct BlockDetails
-{
-	BlockDetails(): number(0), totalDifficulty(0) {}
-	BlockDetails(uint _n, u256 _tD, h256 _p, h256s _c, h256 _bloom): number(_n), totalDifficulty(_tD), parent(_p), children(_c), bloom(_bloom) {}
-	BlockDetails(RLP const& _r);
-	bytes rlp() const;
-
-	bool isNull() const { return !totalDifficulty; }
-	explicit operator bool() const { return !isNull(); }
-
-	uint number;			// TODO: remove?
-	u256 totalDifficulty;
-	h256 parent;
-	h256s children;
-	h256 bloom;
-};
-
-struct BlockBlooms
-{
-	BlockBlooms() {}
-	BlockBlooms(RLP const& _r) { blooms = _r.toVector<h256>(); }
-	bytes rlp() const { RLPStream s; s << blooms; return s.out(); }
-
-	h256s blooms;
-};
-
-struct BlockTraces
-{
-	BlockTraces() {}
-	BlockTraces(RLP const& _r) { for (auto const& i: _r) traces.emplace_back(i.data()); }
-	bytes rlp() const { RLPStream s(traces.size()); for (auto const& i: traces) i.streamOut(s); return s.out(); }
-
-	Manifests traces;
-};
-
-
-typedef std::map<h256, BlockDetails> BlockDetailsHash;
-typedef std::map<h256, BlockBlooms> BlockBloomsHash;
-typedef std::map<h256, BlockTraces> BlockTracesHash;
-
-static const BlockDetails NullBlockDetails;
-static const BlockBlooms NullBlockBlooms;
-static const BlockTraces NullBlockTraces;
-
 static const h256s NullH256s;
 
 class State;
@@ -95,16 +48,11 @@ struct BlockChainNote: public LogChannel { static const char* name() { return "=
 // TODO: Move all this Genesis stuff into Genesis.h/.cpp
 std::map<Address, AddressState> const& genesisState();
 
-using ReadGuard = boost::shared_lock<boost::shared_mutex>;
-using UpgradableGuard = boost::upgrade_lock<boost::shared_mutex>;
-using UpgradeGuard = boost::upgrade_to_unique_lock<boost::shared_mutex>;
-using WriteGuard = boost::unique_lock<boost::shared_mutex>;
-
 ldb::Slice toSlice(h256 _h, unsigned _sub = 0);
 
 /**
  * @brief Implements the blockchain database. All data this gives is disk-backed.
- * @todo Make thread-safe.
+ * @threadsafe
  * @todo Make not memory hog (should actually act as a cache and deallocate old entries).
  */
 class BlockChain

libethereum/BlockDetails.cpp

@@ -0,0 +1,40 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file BlockDetails.cpp
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#include "BlockDetails.h"
+
+#include <libethential/Common.h>
+using namespace std;
+using namespace eth;
+
+BlockDetails::BlockDetails(RLP const& _r)
+{
+	number = _r[0].toInt<uint>();
+	totalDifficulty = _r[1].toInt<u256>();
+	parent = _r[2].toHash<h256>();
+	children = _r[3].toVector<h256>();
+	bloom = _r[4].toHash<h256>();
+}
+
+bytes BlockDetails::rlp() const
+{
+	return rlpList(number, totalDifficulty, parent, children, bloom);
+}

libethereum/BlockDetails.h

@@ -0,0 +1,76 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file BlockDetails.h
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#pragma once
+
+#include <libethential/Log.h>
+#include <libethential/RLP.h>
+#include "Manifest.h"
+namespace ldb = leveldb;
+
+namespace eth
+{
+
+struct BlockDetails
+{
+	BlockDetails(): number(0), totalDifficulty(0) {}
+	BlockDetails(uint _n, u256 _tD, h256 _p, h256s _c, h256 _bloom): number(_n), totalDifficulty(_tD), parent(_p), children(_c), bloom(_bloom) {}
+	BlockDetails(RLP const& _r);
+	bytes rlp() const;
+
+	bool isNull() const { return !totalDifficulty; }
+	explicit operator bool() const { return !isNull(); }
+
+	uint number;			// TODO: remove?
+	u256 totalDifficulty;
+	h256 parent;
+	h256s children;
+	h256 bloom;
+};
+
+struct BlockBlooms
+{
+	BlockBlooms() {}
+	BlockBlooms(RLP const& _r) { blooms = _r.toVector<h256>(); }
+	bytes rlp() const { RLPStream s; s << blooms; return s.out(); }
+
+	h256s blooms;
+};
+
+struct BlockTraces
+{
+	BlockTraces() {}
+	BlockTraces(RLP const& _r) { for (auto const& i: _r) traces.emplace_back(i.data()); }
+	bytes rlp() const { RLPStream s(traces.size()); for (auto const& i: traces) i.streamOut(s); return s.out(); }
+
+	Manifests traces;
+};
+
+
+typedef std::map<h256, BlockDetails> BlockDetailsHash;
+typedef std::map<h256, BlockBlooms> BlockBloomsHash;
+typedef std::map<h256, BlockTraces> BlockTracesHash;
+
+static const BlockDetails NullBlockDetails;
+static const BlockBlooms NullBlockBlooms;
+static const BlockTraces NullBlockTraces;
+
+}

libethereum/Guards.cpp

@@ -0,0 +1,29 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file Guards.cpp
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#include "Guards.h"
+using namespace std;
+using namespace eth;
+
+namespace eth
+{
+
+}

libethereum/Guards.h

@@ -0,0 +1,34 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file Guards.h
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#pragma once
+
+#include <boost/thread.hpp>
+
+namespace eth
+{
+
+using ReadGuard = boost::shared_lock<boost::shared_mutex>;
+using UpgradableGuard = boost::upgrade_lock<boost::shared_mutex>;
+using UpgradeGuard = boost::upgrade_to_unique_lock<boost::shared_mutex>;
+using WriteGuard = boost::unique_lock<boost::shared_mutex>;
+
+}

libethereum/TransactionQueue.cpp

@@ -31,6 +31,8 @@ bool TransactionQueue::import(bytesConstRef _block)
 {
 	// Check if we already know this transaction.
 	h256 h = sha3(_block);
+
+	UpgradableGuard l(x_data);
 	if (m_data.count(h))
 		return false;
 
@@ -40,10 +42,9 @@ bool TransactionQueue::import(bytesConstRef _block)
 		// The transaction's nonce may yet be invalid (or, it could be "valid" but we may be missing a marginally older transaction).
 		Transaction t(_block);
 		auto s = t.sender();
-		if (m_interest.count(s))
-			m_interestQueue.push_back(t);
 
 		// If valid, append to blocks.
+		UpgradeGuard ul(l);
 		m_data[h] = _block.toBytes();
 	}
 	catch (InvalidTransactionFormat const& _e)
@@ -62,8 +63,10 @@ bool TransactionQueue::import(bytesConstRef _block)
 
 void TransactionQueue::setFuture(std::pair<h256, bytes> const& _t)
 {
+	UpgradableGuard l(x_data);
 	if (m_data.count(_t.first))
 	{
+		UpgradeGuard ul(l);
 		m_data.erase(_t.first);
 		m_future.insert(make_pair(Transaction(_t.second).sender(), _t));
 	}
@@ -71,6 +74,7 @@ void TransactionQueue::setFuture(std::pair<h256, bytes> const& _t)
 
 void TransactionQueue::noteGood(std::pair<h256, bytes> const& _t)
 {
+	WriteGuard l(x_data);
 	auto r = m_future.equal_range(Transaction(_t.second).sender());
 	for (auto it = r.first; it != r.second; ++it)
 		m_data.insert(_t);

libethereum/TransactionQueue.h

@@ -21,8 +21,10 @@
 
 #pragma once
 
+#include <boost/thread.hpp>
 #include <libethential/Common.h>
-#include "Transaction.h"
+#include "libethcore/CommonEth.h"
+#include "Guards.h"
 
 namespace eth
 {
@@ -31,27 +33,26 @@ class BlockChain;
 
 /**
  * @brief A queue of Transactions, each stored as RLP.
+ * @threadsafe
  */
 class TransactionQueue
 {
 public:
-	bool attemptImport(bytesConstRef _block) { try { import(_block); return true; } catch (...) { return false; } }
-	bool attemptImport(bytes const& _block) { try { import(&_block); return true; } catch (...) { return false; } }
-	bool import(bytesConstRef _block);
-	void drop(h256 _txHash) { m_data.erase(_txHash); }
-	std::map<h256, bytes> const& transactions() const { return m_data; }
+	bool attemptImport(bytesConstRef _tx) { try { import(_block); return true; } catch (...) { return false; } }
+	bool attemptImport(bytes const& _tx) { return attemptImport(&_block); }
+	bool import(bytesConstRef _tx);
+
+	void drop(h256 _txHash) { WriteGuard l(x_data); m_data.erase(_txHash); }
+
+	std::map<h256, bytes> transactions() const { ReadGuard l(x_data); return m_data; }
 
 	void setFuture(std::pair<h256, bytes> const& _t);
 	void noteGood(std::pair<h256, bytes> const& _t);
 
-	Transactions interestQueue() { Transactions ret; swap(ret, m_interestQueue); return ret; }
-	void pushInterest(Address _a) { m_interest[_a]++; }
-	void popInterest(Address _a) { if (m_interest[_a] > 1) m_interest[_a]--; else if (m_interest[_a]) m_interest.erase(_a); }
-
 private:
 	std::map<h256, bytes> m_data;								///< Map of SHA3(tx) to tx.
-	Transactions m_interestQueue;
-	std::map<Address, int> m_interest;
+	boost::shared_mutex x_data;
+
 	std::multimap<Address, std::pair<h256, bytes>> m_future;	///< For transactions that have a future nonce; we map their sender address to the tx stuff, and insert once the sender has a valid TX.
 };