try to deal with possible deadlocks

Author: mining-visualizer

CMakeLists.txt

@@ -1,7 +1,7 @@
 # cmake global
 cmake_minimum_required(VERSION 2.8.12)
 
-set(PROJECT_VERSION "2.1.10")
+set(PROJECT_VERSION "2.1.11")
 if (${CMAKE_VERSION} VERSION_GREATER 3.0)
 	cmake_policy(SET CMP0042 OLD) 	# fix MACOSX_RPATH
 	cmake_policy(SET CMP0048 NEW) 	# allow VERSION argument in project()

libethcore/Farm.h

@@ -606,6 +606,7 @@ class GenericFarm
 	bool submitProof(h256 _nonce, Miner* _m) 
 	{
 		// return true if miner should stop and wait for new work, false to keep mining
+
 		bool shouldStop = false;
 
 		LogF << "Trace: GenericFarm.submitProof - nonce = " << _nonce.hex().substr(0, 8) << ", miner = " << _m->index();
@@ -617,7 +618,7 @@ class GenericFarm
 			   - setWork has been called with a new work package
 		*/
 
-		WriteGuard l(x_minerWork);
+		Guard l(x_solution);
 
 		// check to see if the main loop is still processing a previous solution
 		if (solutionMiner == -1)
@@ -627,6 +628,7 @@ class GenericFarm
 			solution = _nonce;
 			if (m_opMode == OperationMode::Solo)
 			{
+				WriteGuard lck(x_minerWork);
 				m_challenge.clear();
 				for (auto const& m : m_miners)
 					if (m != _m)
@@ -649,7 +651,7 @@ class GenericFarm
 	{
 		// check if any of the miners has found a solution
 
-		WriteGuard l(x_minerWork);
+		Guard l(x_solution);
 
 		if (solutionMiner != -1)
 		{
@@ -710,6 +712,7 @@ class GenericFarm
 
 	h256 solution;
 	int solutionMiner = -1;
+	mutable Mutex x_solution;
 
 };