Reduce number of statics in EthashAux

libethcore/EthashAux.cpp

@@ -43,10 +43,8 @@ using namespace eth;
 
 const char* DAGChannel::name() { return EthGreen "DAG"; }
 
+Mutex dev::eth::EthashAux::x_this;
 EthashAux* dev::eth::EthashAux::s_this = nullptr;
-SharedMutex dev::eth::EthashAux::x_lights;
-Mutex dev::eth::EthashAux::x_epochs;
-Mutex dev::eth::EthashAux::x_fulls;
 
 EthashAux::~EthashAux()
 {
@@ -65,7 +63,7 @@ uint64_t EthashAux::dataSize(uint64_t _blockNumber)
 h256 EthashAux::seedHash(unsigned _number)
 {
 	unsigned epoch = _number / ETHASH_EPOCH_LENGTH;
-	Guard l(x_epochs);
+	Guard l(get()->x_epochs);
 	if (epoch >= get()->m_seedHashes.size())
 	{
 		h256 ret;
@@ -88,7 +86,7 @@ h256 EthashAux::seedHash(unsigned _number)
 
 uint64_t EthashAux::number(h256 const& _seedHash)
 {
-	Guard l(x_epochs);
+	Guard l(get()->x_epochs);
 	unsigned epoch = 0;
 	auto epochIter = get()->m_epochs.find(_seedHash);
 	if (epochIter == get()->m_epochs.end())
@@ -115,7 +113,7 @@ void EthashAux::killCache(h256 const& _s)
 
 EthashAux::LightType EthashAux::light(h256 const& _seedHash)
 {
-	ReadGuard l(x_lights);
+	ReadGuard l(get()->x_lights);
 	LightType ret = get()->m_lights[_seedHash];
 	return ret ? ret : (get()->m_lights[_seedHash] = make_shared<LightAllocation>(_seedHash));
 }
@@ -173,7 +171,7 @@ EthashAux::FullType EthashAux::full(h256 const& _seedHash, bool _createIfMissing
 	FullType ret;
 	auto l = light(_seedHash);
 
-	DEV_GUARDED(x_fulls)
+	DEV_GUARDED(get()->x_fulls)
 		if ((ret = get()->m_fulls[_seedHash].lock()))
 		{
 			get()->m_lastUsedFull = ret;
@@ -187,7 +185,7 @@ EthashAux::FullType EthashAux::full(h256 const& _seedHash, bool _createIfMissing
 		ret = make_shared<FullAllocation>(l->light, dagCallbackShim);
 //		cnote << "Done loading.";
 
-		DEV_GUARDED(x_fulls)
+		DEV_GUARDED(get()->x_fulls)
 			get()->m_fulls[_seedHash] = get()->m_lastUsedFull = ret;
 	}
 
@@ -198,7 +196,7 @@ EthashAux::FullType EthashAux::full(h256 const& _seedHash, bool _createIfMissing
 
 unsigned EthashAux::computeFull(h256 const& _seedHash, bool _createIfMissing)
 {
-	Guard l(x_fulls);
+	Guard l(get()->x_fulls);
 	uint64_t blockNumber;
 
 	DEV_IF_THROWS(blockNumber = EthashAux::number(_seedHash))
@@ -251,7 +249,7 @@ Ethash::Result EthashAux::eval(BlockInfo const& _header, Nonce const& _nonce)
 
 Ethash::Result EthashAux::eval(h256 const& _seedHash, h256 const& _headerHash, Nonce const& _nonce)
 {
-	DEV_GUARDED(x_fulls)
+	DEV_GUARDED(get()->x_fulls)
 		if (FullType dag = get()->m_fulls[_seedHash].lock())
 			return dag->compute(_headerHash, _nonce);
 	DEV_IF_THROWS(return EthashAux::get()->light(_seedHash)->compute(_headerHash, _nonce))

libethcore/EthashAux.h

@@ -38,7 +38,7 @@ class EthashAux
 public:
 	~EthashAux();
 
-	static EthashAux* get() { if (!s_this) s_this = new EthashAux(); return s_this; }
+	static EthashAux* get() {Guard l(x_this);if (!s_this) s_this = new EthashAux(); return s_this; }
 
 	struct LightAllocation
 	{
@@ -89,12 +89,13 @@ private:
 
 	void killCache(h256 const& _s);
 
+	static Mutex x_this;
 	static EthashAux* s_this;
 
-	static SharedMutex x_lights;
+	SharedMutex x_lights;
 	std::unordered_map<h256, std::shared_ptr<LightAllocation>> m_lights;
 
-	static Mutex x_fulls;
+	Mutex x_fulls;
 	std::condition_variable m_fullsChanged;
 	std::unordered_map<h256, std::weak_ptr<FullAllocation>> m_fulls;
 	FullType m_lastUsedFull;
@@ -102,7 +103,7 @@ private:
 	uint64_t m_generatingFullNumber = NotGenerating;
 	unsigned m_fullProgress;
 
-	static Mutex x_epochs;
+	Mutex x_epochs;
 	std::unordered_map<h256, unsigned> m_epochs;
 	h256s m_seedHashes;
 };