From c4df26e82ed48138e5e8cf9323467f3113bc4506 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 19 May 2015 22:15:23 +0200
Subject: [PATCH] Actually load the DAG.

---
 alethzero/MainWin.cpp    |  2 +-
 ethminer/MinerAux.h      | 12 ++++++------
 libethcore/EthashAux.cpp |  6 +++---
 libethcore/EthashAux.h   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index b59e9ce1f..a09966679 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -1166,7 +1166,7 @@ void Main::on_turboMining_triggered()
 
 void Main::refreshBlockChain()
 {
-	if (!ui->blocks->isVisible())
+	if (!ui->blocks->isVisible() || !isVisible())
 		return;
 
 	DEV_TIMED_FUNCTION;
diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
index 8e480a3ff..53a5fa7e4 100644
--- a/ethminer/MinerAux.h
+++ b/ethminer/MinerAux.h
@@ -388,7 +388,7 @@ private:
 		(void)_m;
 		(void)_remote;
 		(void)_recheckPeriod;
-	#if ETH_JSONRPC || !ETH_TRUE
+#if ETH_JSONRPC || !ETH_TRUE
 		jsonrpc::HttpClient client(_remote);
 
 		Farm rpc(client);
@@ -399,7 +399,7 @@ private:
 			f.startGPU();
 
 		ProofOfWork::WorkPackage current;
-        EthashAux::FullType dag;
+		EthashAux::FullType dag;
 		while (true)
 			try
 			{
@@ -418,9 +418,9 @@ private:
 						cnote << "Getting work package...";
 					Json::Value v = rpc.eth_getWork();
 					h256 hh(v[0].asString());
-                    h256 newSeedHash(v[1].asString());
-                    if (!(dag = EthashAux::full(newSeedHash, true)))
-                        BOOST_THROW_EXCEPTION(DAGCreationFailure());
+					h256 newSeedHash(v[1].asString());
+					if (!(dag = EthashAux::full(newSeedHash, true, [&](unsigned _pc){ cout << "\rCreating DAG. " << _pc << "% done..." << flush; return 0; })))
+						BOOST_THROW_EXCEPTION(DAGCreationFailure());
 					if (hh != current.headerHash)
 					{
 						current.headerHash = hh;
@@ -459,7 +459,7 @@ private:
 					cerr << "JSON-RPC problem. Probably couldn't connect. Retrying in " << i << "... \r";
 				cerr << endl;
 			}
-	#endif
+#endif
 		exit(0);
 	}
 
diff --git a/libethcore/EthashAux.cpp b/libethcore/EthashAux.cpp
index 38425aca2..a94c1237d 100644
--- a/libethcore/EthashAux.cpp
+++ b/libethcore/EthashAux.cpp
@@ -167,7 +167,7 @@ EthashAux::FullType EthashAux::full(h256 const& _seedHash, bool _createIfMissing
 			return ret;
 		}
 
-	if (_createIfMissing || computeFull(_seedHash) == 100)
+	if (_createIfMissing || computeFull(_seedHash, false) == 100)
 	{
 		s_dagCallback = _f;
 		cnote << "Loading from libethash...";
@@ -183,7 +183,7 @@ EthashAux::FullType EthashAux::full(h256 const& _seedHash, bool _createIfMissing
 
 #define DEV_IF_THROWS(X) try { X; } catch (...)
 
-unsigned EthashAux::computeFull(h256 const& _seedHash)
+unsigned EthashAux::computeFull(h256 const& _seedHash, bool _createIfMissing)
 {
 	Guard l(get()->x_fulls);
 	uint64_t blockNumber;
@@ -199,7 +199,7 @@ unsigned EthashAux::computeFull(h256 const& _seedHash)
 		return 100;
 	}
 
-	if (!get()->m_fullGenerator || !get()->m_fullGenerator->joinable())
+	if (_createIfMissing && (!get()->m_fullGenerator || !get()->m_fullGenerator->joinable()))
 	{
 		get()->m_fullProgress = 0;
 		get()->m_generatingFullNumber = blockNumber / ETHASH_EPOCH_LENGTH * ETHASH_EPOCH_LENGTH;
diff --git a/libethcore/EthashAux.h b/libethcore/EthashAux.h
index b09f6465f..e6fed519f 100644
--- a/libethcore/EthashAux.h
+++ b/libethcore/EthashAux.h
@@ -71,7 +71,7 @@ public:
 
 	static const uint64_t NotGenerating = (uint64_t)-1;
 	/// Kicks off generation of DAG for @a _seedHash and @returns false or @returns true if ready.
-	static unsigned computeFull(h256 const& _seedHash);
+	static unsigned computeFull(h256 const& _seedHash, bool _createIfMissing = true);
 	/// Information on the generation progress.
 	static std::pair<uint64_t, unsigned> fullGeneratingProgress() { return std::make_pair(get()->m_generatingFullNumber, get()->m_fullProgress); }
 	/// Kicks off generation of DAG for @a _blocknumber and blocks until ready; @returns result or empty pointer if not existing and _createIfMissing is false.