diff options
| author | fireice-uk <fireice-uk@users.noreply.github.com> | 2018-01-19 14:37:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 14:37:05 +0000 |
| commit | 26b14f316fdd86bcf898d09a89f3a5c2566cbc60 (patch) | |
| tree | 50302454db6a389fc22a2591f4abaf4a1945359d /xmrstak/misc | |
| parent | 05dcbf6fee37e12309ec5c48951c4bf829cc14d0 (diff) | |
| parent | 6d21de7f7d38324e980255ed116d21f86ba740e5 (diff) | |
| download | xmr-stak-26b14f316fdd86bcf898d09a89f3a5c2566cbc60.zip xmr-stak-26b14f316fdd86bcf898d09a89f3a5c2566cbc60.tar.gz | |
Merge pull request #803 from ChaosMarc/detailedhashreport
#125: separate hashrate sums for each component
Diffstat (limited to 'xmrstak/misc')
| -rw-r--r-- | xmrstak/misc/executor.cpp | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp index f0b6e0e..055739b 100644 --- a/xmrstak/misc/executor.cpp +++ b/xmrstak/misc/executor.cpp @@ -761,6 +761,7 @@ void executor::hashrate_report(std::string& out) else out.append(1, '\n'); + double fTotalCur[3] = { 0.0, 0.0, 0.0}; for (i = 0; i < nthd; i++) { double fHps[3]; @@ -775,10 +776,14 @@ void executor::hashrate_report(std::string& out) out.append(hps_format(fHps[0], num, sizeof(num))).append(" |"); out.append(hps_format(fHps[1], num, sizeof(num))).append(" |"); out.append(hps_format(fHps[2], num, sizeof(num))).append(1, ' '); - - fTotal[0] += fHps[0]; - fTotal[1] += fHps[1]; - fTotal[2] += fHps[2]; + + fTotal[0] += (std::isnormal(fHps[0])) ? fHps[0] : 0.0; + fTotal[1] += (std::isnormal(fHps[1])) ? fHps[1] : 0.0; + fTotal[2] += (std::isnormal(fHps[2])) ? fHps[2] : 0.0; + + fTotalCur[0] += (std::isnormal(fHps[0])) ? fHps[0] : 0.0; + fTotalCur[1] += (std::isnormal(fHps[1])) ? fHps[1] : 0.0; + fTotalCur[2] += (std::isnormal(fHps[2])) ? fHps[2] : 0.0; if((i & 0x1) == 1) //Odd i's out.append("|\n"); @@ -786,21 +791,25 @@ void executor::hashrate_report(std::string& out) if((i & 0x1) == 1) //We had odd number of threads out.append("|\n"); - - if(nthd != 1) - out.append("-----------------------------------------------------\n"); - else - out.append("---------------------------\n"); + + out.append("Totals (").append(name).append("): "); + out.append(hps_format(fTotalCur[0], num, sizeof(num))); + out.append(hps_format(fTotalCur[1], num, sizeof(num))); + out.append(hps_format(fTotalCur[2], num, sizeof(num))); + out.append(" H/s\n"); + + out.append("-----------------------------------------------------------------\n"); } } - out.append("Totals: "); + out.append("Totals (ALL): "); out.append(hps_format(fTotal[0], num, sizeof(num))); out.append(hps_format(fTotal[1], num, sizeof(num))); out.append(hps_format(fTotal[2], num, sizeof(num))); out.append(" H/s\nHighest: "); out.append(hps_format(fHighestHps, num, sizeof(num))); out.append(" H/s\n"); + out.append("-----------------------------------------------------------------\n"); } char* time_format(char* buf, size_t len, std::chrono::system_clock::time_point time) |
