Fixed CPP Warnings and simplified logic for EthGetworkClient

Author: AndreaLanfranchi

libpoolprotocols/PoolClient.h

@@ -22,7 +22,6 @@ namespace dev
 			void setConnection(URI &conn)
 			{
 				m_conn = &conn;
-				m_connection_changed = true;
 			}
 
 			virtual void connect() = 0;
@@ -47,9 +46,10 @@ namespace dev
 			void onWorkReceived(WorkReceived const& _handler) { m_onWorkReceived = _handler; }
 
 		protected:
-			bool m_authorized = false;
-			bool m_connected = false;
-			bool m_connection_changed = false;
+			std::atomic<bool> m_subscribed = { false };
+			std::atomic<bool> m_authorized = { false };
+			std::atomic<bool> m_connected = { false };
+
 			boost::asio::ip::basic_endpoint<boost::asio::ip::tcp> m_endpoint;
 
 			URI* m_conn = nullptr;

libpoolprotocols/getwork/EthGetworkClient.cpp

@@ -11,11 +11,10 @@ using namespace eth;
 EthGetworkClient::EthGetworkClient(unsigned farmRecheckPeriod, bool submitHashrate) : PoolClient(), Worker("getwork"), m_submit_hashrate(submitHashrate)
 {
 	m_farmRecheckPeriod = farmRecheckPeriod;
-	m_authorized = true;
-	m_connection_changed = true;
+	m_subscribed.store(true, std::memory_order_relaxed);
+	m_authorized.store(true, std::memory_order_relaxed);
 	if (m_submit_hashrate)
 		m_client_id = h256::random();
-	startWorking();
 }
 
 EthGetworkClient::~EthGetworkClient()
@@ -25,22 +24,25 @@ EthGetworkClient::~EthGetworkClient()
 
 void EthGetworkClient::connect()
 {
-	if (m_connection_changed) {
-		stringstream ss;
-		ss <<  "http://" + m_conn->Host() << ':' << m_conn->Port();
-		if (m_conn->Path().length())
-			ss << m_conn->Path();
-		p_client = new ::JsonrpcGetwork(new jsonrpc::HttpClient(ss.str()));
+    stringstream ss;
+    ss << "http://" + m_conn->Host() << ':' << m_conn->Port();
+    if (m_conn->Path().length())
+        ss << m_conn->Path();
+    p_client = new ::JsonrpcGetwork(new jsonrpc::HttpClient(ss.str()));
+
+	// Since we do not have a real connected state with getwork, we just fake it.
+	if (m_onConnected) {
+		m_onConnected();
 	}
 
-	m_connection_changed = false;
-	m_justConnected = true; // We set a fake flag, that we can check with workhandler if connection works
+	// No need to worry about starting again.
+	// Worker class prevents that
+    startWorking();
 }
 
 void EthGetworkClient::disconnect()
 {
-	m_connected = false;
-	m_justConnected = false;
+	m_connected.store(false, std::memory_order_relaxed);
 
 	// Since we do not have a real connected state with getwork, we just fake it.
 	if (m_onDisconnected) {
@@ -59,7 +61,7 @@ void EthGetworkClient::submitHashrate(string const & rate)
 void EthGetworkClient::submitSolution(const Solution& solution)
 {
 	// Immediately send found solution without wait for loop
-	if (m_connected || m_justConnected) {
+	if (m_connected.load(std::memory_order_relaxed)) {
 		try
 		{
 			bool accepted = p_client->eth_submitWork("0x" + toHex(solution.nonce), "0x" + toString(solution.work.header), "0x" + toString(solution.mixHash));
@@ -85,9 +87,9 @@ void EthGetworkClient::submitSolution(const Solution& solution)
 // Handles all getwork communication.
 void EthGetworkClient::workLoop()
 {
-	while (true)
+	while (!shouldStop())
 	{
-		if (m_connected || m_justConnected) {
+		if (m_connected.load(std::memory_order_relaxed)) {
 
 			// Get Work
 			try
@@ -98,14 +100,6 @@ void EthGetworkClient::workLoop()
                 newWorkPackage.epoch = ethash::find_epoch_number(
                     ethash::hash256_from_bytes(h256{v[1].asString()}.data()));
 
-                // Since we do not have a real connected state with getwork, we just fake it.
-				// If getting work succeeds we know that the connection works
-				if (m_justConnected && m_onConnected) {
-					m_justConnected = false;
-					m_connected = true;
-					m_onConnected();
-				}
-
 				// Check if header changes so the new workpackage is really new
 				if (newWorkPackage.header != m_prevWorkPackage.header) {
 					m_prevWorkPackage.header = newWorkPackage.header;
@@ -129,16 +123,16 @@ void EthGetworkClient::workLoop()
 				{
 					p_client->eth_submitHashrate(m_currentHashrateToSubmit, "0x" + m_client_id.hex());
 				}
-				catch (const jsonrpc::JsonRpcException&)
+				catch (const jsonrpc::JsonRpcException& _e)
 				{
-					//cwarn << "Failed to submit hashrate.";
-					//cwarn << boost::diagnostic_information(_e);
+					cwarn << "Failed to submit hashrate.";
+					cwarn << boost::diagnostic_information(_e);
 				}
 				m_currentHashrateToSubmit.clear();
 			}
 		}
 
-		// Sleep
+		// Sleep for --farm-recheck defined period
 		this_thread::sleep_for(chrono::milliseconds(m_farmRecheckPeriod));
 	}
 }

libpoolprotocols/getwork/EthGetworkClient.h

@@ -33,7 +33,6 @@ class EthGetworkClient : public PoolClient, Worker
 
 	string m_currentHashrateToSubmit = "";
 
-	bool m_justConnected = false;
 	h256 m_client_id;
 	JsonrpcGetwork *p_client = nullptr;
 	WorkPackage m_prevWorkPackage;

libpoolprotocols/stratum/EthStratumClient.cpp

@@ -40,7 +40,7 @@ static void diffToTarget(uint32_t *target, double diff)
 }
 
 
-EthStratumClient::EthStratumClient(boost::asio::io_service & io_service, int worktimeout, int responsetimeout, string email, bool submitHashrate) : PoolClient(),
+EthStratumClient::EthStratumClient(boost::asio::io_service & io_service, int worktimeout, int responsetimeout, const string& email, bool submitHashrate) : PoolClient(),
 	m_worktimeout(worktimeout),
 	m_responsetimeout(responsetimeout),
 	m_io_service(io_service),

libpoolprotocols/stratum/EthStratumClient.h

@@ -24,7 +24,7 @@ class EthStratumClient : public PoolClient
 
 	typedef enum { STRATUM = 0, ETHPROXY, ETHEREUMSTRATUM } StratumProtocol;
 
-	EthStratumClient(boost::asio::io_service & io_service, int worktimeout, int responsetimeout, string email, bool submitHashrate);
+	EthStratumClient(boost::asio::io_service & io_service, int worktimeout, int responsetimeout, const string& email, bool submitHashrate);
 	~EthStratumClient();
 
 	void connect() override;
@@ -68,9 +68,6 @@ class EthStratumClient : public PoolClient
 
 	string m_worker; // eth-proxy only; No ! It's for all !!!
 
-	std::atomic<bool> m_subscribed = { false };
-	std::atomic<bool> m_authorized = { false };
-	std::atomic<bool> m_connected = { false };
 	std::atomic<bool> m_disconnecting = { false };
 	std::atomic<bool> m_connecting = { false };
 

libpoolprotocols/testing/SimulateClient.cpp

@@ -11,7 +11,7 @@ SimulateClient::SimulateClient(unsigned const & difficulty, unsigned const & blo
 {
 	m_difficulty = difficulty -1;
 	m_block = block;
-	startWorking();
+	
 }
 
 SimulateClient::~SimulateClient()
@@ -21,17 +21,22 @@ SimulateClient::~SimulateClient()
 
 void SimulateClient::connect()
 {
-	m_connected = true;
+	m_connected.store(true, std::memory_order_relaxed);
 	m_uppDifficulty = true;
 
 	if (m_onConnected) {
 		m_onConnected();
 	}
+
+	// No need to worry about starting again.
+	// Worker class prevents that
+	startWorking();
+
 }
 
 void SimulateClient::disconnect()
 {
-	m_connected = false;
+	m_connected.store(false, std::memory_order_relaxed);
 
 	if (m_onDisconnected) {
 		m_onDisconnected();
@@ -73,7 +78,7 @@ void SimulateClient::workLoop()
 	m_time = std::chrono::steady_clock::now();
 	while (true)
 	{
-		if (m_connected) {
+		if (m_connected.load(std::memory_order_relaxed)) {
 			if (m_uppDifficulty) {
 				m_uppDifficulty = false;