Fix data race in mining progress

Author: chfast

libethcore/Farm.h

@@ -160,39 +160,39 @@ class Farm: public FarmFace
 		}
 	}
 
-	void collectHashRate()
-	{
-		WorkingProgress p;
-		Guard l2(x_minerWork);
-		p.ms = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - m_lastStart).count();
-		//Collect
-		for (auto const& i : m_miners)
-		{
-			uint64_t minerHashCount = i->hashCount();
-			p.hashes += minerHashCount;
-			p.minersHashes.push_back(minerHashCount);
-		}
+    void collectHashRate()
+    {
+        auto now = std::chrono::steady_clock::now();
 
-		//Reset
-		for (auto const& i : m_miners)
-		{
-			i->resetHashCount();
-		}
-		m_lastStart = std::chrono::steady_clock::now();
+        std::lock_guard<std::mutex> lock(x_minerWork);
 
-		if (p.hashes > 0) {
-			m_lastProgresses.push_back(p);
-		}
+        WorkingProgress p;
+        p.ms = std::chrono::duration_cast<std::chrono::milliseconds>(now - m_lastStart).count();
+        m_lastStart = now;
 
-		// We smooth the hashrate over the last x seconds
-		int allMs = 0;
-		for (auto const& cp : m_lastProgresses) {
-			allMs += cp.ms;
-		}
-		if (allMs > m_hashrateSmoothInterval) {
-			m_lastProgresses.erase(m_lastProgresses.begin());
-		}
-	}
+        // Collect
+        for (auto const& i : m_miners)
+        {
+            uint64_t minerHashCount = i->hashCount();
+            p.hashes += minerHashCount;
+            p.minersHashes.push_back(minerHashCount);
+        }
+
+        // Reset
+        for (auto const& i : m_miners)
+            i->resetHashCount();
+
+        if (p.hashes > 0)
+            m_lastProgresses.push_back(p);
+
+        // We smooth the hashrate over the last x seconds
+        int allMs = 0;
+        for (auto const& cp : m_lastProgresses)
+            allMs += cp.ms;
+
+        if (allMs > m_hashrateSmoothInterval)
+            m_lastProgresses.erase(m_lastProgresses.begin());
+    }
 
 	void processHashRate(const boost::system::error_code& ec) {
 
@@ -223,37 +223,36 @@ class Farm: public FarmFace
 		return m_isMining;
 	}
 
-	/**
-	 * @brief Get information on the progress of mining this work package.
-	 * @return The progress with mining so far.
-	 */
-	WorkingProgress const& miningProgress(bool hwmon = false) const
-	{
-		WorkingProgress p;
-		p.ms = 0;
-		p.hashes = 0;
-		{
-			Guard l2(x_minerWork);
-			for (auto const& i : m_miners) {
-				p.minersHashes.push_back(0);
-				if (hwmon)
-					p.minerMonitors.push_back(i->hwmon());
-			}
-		}
-
-		for (auto const& cp : m_lastProgresses) {
-			p.ms += cp.ms;
-			p.hashes += cp.hashes;
-			for (unsigned int i = 0; i < cp.minersHashes.size(); i++)
-			{
-				p.minersHashes.at(i) += cp.minersHashes.at(i);
-			}
-		}
-
-		Guard l(x_progress);
-		m_progress = p;
-		return m_progress;
-	}
+    /**
+     * @brief Get information on the progress of mining this work package.
+     * @return The progress with mining so far.
+     */
+    WorkingProgress const& miningProgress(bool hwmon = false) const
+    {
+        std::lock_guard<std::mutex> lock(x_minerWork);
+        WorkingProgress p;
+        p.ms = 0;
+        p.hashes = 0;
+        for (auto const& i : m_miners)
+        {
+            p.minersHashes.push_back(0);
+            if (hwmon)
+                p.minerMonitors.push_back(i->hwmon());
+        }
+
+        for (auto const& cp : m_lastProgresses)
+        {
+            p.ms += cp.ms;
+            p.hashes += cp.hashes;
+            for (unsigned int i = 0; i < cp.minersHashes.size(); i++)
+            {
+                p.minersHashes.at(i) += cp.minersHashes.at(i);
+            }
+        }
+
+        m_progress = p;
+        return m_progress;
+    }
 
 	SolutionStats getSolutionStats() {
 		return m_solutionStats;
@@ -350,11 +349,8 @@ class Farm: public FarmFace
 
 	std::atomic<bool> m_isMining = {false};
 
-	mutable Mutex x_progress;
 	mutable WorkingProgress m_progress;
 
-	mutable Mutex x_hwmons;
-
 	SolutionFound m_onSolutionFound;
 	MinerRestart m_onMinerRestart;