Merge pull request #644 from ethereum-mining/data-races

Data races fixes

Author: chfast

libethcore/Miner.h

@@ -184,9 +184,9 @@ class Miner: public Worker
 		kick_miner();
 	}
 
-	uint64_t hashCount() const { return m_hashCount; }
+	uint64_t hashCount() const { return m_hashCount.load(std::memory_order_relaxed); }
 
-	void resetHashCount() { m_hashCount = 0; }
+	void resetHashCount() { m_hashCount.store(0, std::memory_order_relaxed); }
 
 	virtual HwMonitor hwmon() = 0;
 
@@ -207,7 +207,7 @@ class Miner: public Worker
 
 	WorkPackage work() const { Guard l(x_work); return m_work; }
 
-	void addHashCount(uint64_t _n) { m_hashCount += _n; }
+	void addHashCount(uint64_t _n) { m_hashCount.fetch_add(_n, std::memory_order_relaxed); }
 
 	static unsigned s_dagLoadMode;
 	static unsigned s_dagLoadIndex;
@@ -219,7 +219,7 @@ class Miner: public Worker
 	std::chrono::high_resolution_clock::time_point workSwitchStart;
 
 private:
-	uint64_t m_hashCount = 0;
+	std::atomic<uint64_t> m_hashCount = {0};
 
 	WorkPackage m_work;
 	mutable Mutex x_work;

libstratum/EthStratumClient.cpp

@@ -40,7 +40,6 @@ EthStratumClient::EthStratumClient(Farm* f, MinerType m, string const & host, st
 	p_active = &m_primary;
 
 	m_authorized = false;
-	m_connected = false;
 	m_pending = 0;
 	m_maxRetries = retries;
 	m_worktimeout = worktimeout;
@@ -105,7 +104,7 @@ void EthStratumClient::reconnect()
 	m_io_service.reset();
 	//m_socket.close(); // leads to crashes on Linux
 	m_authorized = false;
-	m_connected = false;
+	m_connected.store(false, std::memory_order_relaxed);
 
 	if (!m_failover.host.empty())
 	{
@@ -138,7 +137,7 @@ void EthStratumClient::reconnect()
 void EthStratumClient::disconnect()
 {
 	cnote << "Disconnecting";
-	m_connected = false;
+	m_connected.store(false, std::memory_order_relaxed);
 	m_running = false;
 	if (p_farm->isMining())
 	{
@@ -170,7 +169,7 @@ void EthStratumClient::connect_handler(const boost::system::error_code& ec, tcp:
 
 	if (!ec)
 	{
-		m_connected = true;
+		m_connected.store(true, std::memory_order_relaxed);
 		cnote << "Connected to stratum server " + i->host_name() + ":" + p_active->port;
 		if (!p_farm->isMining())
 		{
@@ -282,13 +281,13 @@ void EthStratumClient::readResponse(const boost::system::error_code& ec, std::si
 		{
 			cwarn << "Discarding incomplete response";
 		}
-		if (m_connected)
+		if (m_connected.load(std::memory_order_relaxed))
 			readline();
 	}
 	else
 	{
 		cwarn << "Read response failed: " + ec.message();
-		if (m_connected)
+		if (m_connected.load(std::memory_order_relaxed))
 			reconnect();
 	}
 }

libstratum/EthStratumClient.h

@@ -26,7 +26,7 @@ class EthStratumClient
 	void setFailover(string const & host, string const & port, string const & user, string const & pass);
 
 	bool isRunning() { return m_running; }
-	bool isConnected() { return m_connected && m_authorized; }
+	bool isConnected() { return m_connected.load(std::memory_order_relaxed) && m_authorized; }
 	h256 currentHeaderHash() { return m_current.header; }
 	bool current() { return static_cast<bool>(m_current); }
 	bool submitHashrate(string const & rate);
@@ -54,7 +54,7 @@ class EthStratumClient
 	string m_worker; // eth-proxy only;
 
 	bool m_authorized;
-	bool m_connected;
+	std::atomic<bool> m_connected = {false};
 	bool m_running = true;
 
 	int	m_retries = 0;