Merge pull request #225 from evilny0/hashratepercard

Hashrate printed per card.
ethereum-mining · Aug 16, 2017 · 168e3f7 · 168e3f7
2 parents 40eab52 + 822bc77
commit 168e3f7
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 12 deletions.
diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
@@ -775,7 +775,10 @@ class MinerCLI
 					auto mp = f.miningProgress();
 					f.resetMiningProgress();
 					if (current)
-						minelog << "Mining on" << current.header << ": " << mp << f.getSolutionStats();
+					{
+						minelog << "Mining on" << current.header << f.getSolutionStats();
+						minelog << mp;
+					}
 					else
 						minelog << "Getting work package...";
 
@@ -815,7 +818,7 @@ class MinerCLI
 				{
 					bool ok = prpc->eth_submitWork("0x" + toHex(solution.nonce), "0x" + toString(solution.headerHash), "0x" + toString(solution.mixHash));
 					if (ok) {
-						cnote << "B-) Submitted and accepted.";
+						cnote << EthLime << "B-) Submitted and accepted." << EthReset;
 						f.acceptedSolution(false);
 					}
 					else {
@@ -916,7 +919,8 @@ class MinerCLI
 				{
 					if (client.current())
 					{
-						minelog << "Mining on" << client.currentHeaderHash() << ": " << mp << f.getSolutionStats();
+						minelog << "Mining on" << client.currentHeaderHash() << f.getSolutionStats();
+						minelog << mp;
 					}
 					else
 					{
@@ -955,7 +959,8 @@ class MinerCLI
 				{
 					if (client.current())
 					{
-						minelog << "Mining on" << client.currentHeaderHash() << ": " << mp << f.getSolutionStats();
+						minelog << "Mining on" << client.currentHeaderHash() << f.getSolutionStats();
+						minelog << mp;
 					}
 					else if (client.waitState() == MINER_WAIT_STATE_WORK)
 					{

diff --git a/libdevcore/Terminal.h b/libdevcore/Terminal.h
@@ -7,8 +7,6 @@ namespace con
 
 #ifdef _WIN32
 
-#define EthReset ""       // Text Reset
-
 #define EthReset ""       // Text Reset
 
 	// Regular Colors

diff --git a/libethcore/Farm.h b/libethcore/Farm.h
@@ -138,7 +138,11 @@ class Farm: public FarmFace
 		{
 			Guard l2(x_minerWork);
 			for (auto const& i: m_miners)
-				p.hashes += i->hashCount();
+			{
+				uint64_t minerHashCount = i->hashCount();
+				p.hashes += minerHashCount;
+				p.minersHashes.push_back(minerHashCount);
+			}
 		}
 		Guard l(x_progress);
 		m_progress = p;

diff --git a/libethcore/Miner.h b/libethcore/Miner.h
@@ -70,14 +70,24 @@ struct WorkingProgress
 	uint64_t hashes = 0;		///< Total number of hashes computed.
 	uint64_t ms = 0;			///< Total number of milliseconds of mining thus far.
 	uint64_t rate() const { return ms == 0 ? 0 : hashes * 1000 / ms; }
+
+	std::vector<uint64_t> minersHashes;
+	uint64_t minerRate(const uint64_t hashCount) const { return ms == 0 ? 0 : hashCount * 1000 / ms; }
 };
 
 inline std::ostream& operator<<(std::ostream& _out, WorkingProgress _p)
 {
 	float mh = _p.rate() / 1000000.0f;
-	char mhs[16];
-	sprintf(mhs, "%.2f", mh);
-	_out << std::string(mhs) + "MH/s";
+	_out << "Total: " << std::fixed << std::setprecision(2) << mh << "MH/s ( ";
+
+	int gpuIndex=0;
+	for (auto const& i: _p.minersHashes)
+	{
+		mh = _p.minerRate(i) / 1000000.0f;
+		_out << EthBlue << gpuIndex++ << ":" << EthReset << std::fixed << std::setprecision(2) << mh << " ";
+	}
+	_out << ")";
+
 	return _out;
 }
 

diff --git a/libstratum/EthStratumClient.cpp b/libstratum/EthStratumClient.cpp
@@ -359,7 +359,7 @@ void EthStratumClient::processReponse(Json::Value& responseObject)
 		break;
 	case 4:
 		if (responseObject.get("result", false).asBool()) {
-			cnote << "B-) Submitted and accepted.";
+			cnote << EthLime << "B-) Submitted and accepted." << EthReset;
 			p_farm->acceptedSolution(m_stale);
 		}
 		else {

diff --git a/libstratum/EthStratumClientV2.cpp b/libstratum/EthStratumClientV2.cpp
@@ -303,7 +303,7 @@ void EthStratumClientV2::processReponse(Json::Value& responseObject)
 		break;
 	case 4:
 		if (responseObject.get("result", false).asBool()) {
-			cnote << "B-) Submitted and accepted.";
+			cnote << EthLime << "B-) Submitted and accepted." << EthReset;
 			p_farm->acceptedSolution(m_stale);
 		}
 		else {