zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Metrics: Move local solution rate into stats

This commit is contained in:
Jack Grigg 2017-03-23 14:04:12 +13:00
parent 07be8f7eb9
commit dd20d04679
No known key found for this signature in database
GPG Key ID: 6A6914DAFBEA00DA
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/metrics.cpp
View File

@ -156,16 +156,32 @@ void ConnectMetricsScreen()
uiInterface.InitMessage.connect(metrics_InitMessage); uiInterface.InitMessage.connect(metrics_InitMessage);
} }
int printNetworkStats() int printStats(bool mining)
{ {
LOCK2(cs_main, cs_vNodes); // Number of lines that are always displayed
int lines = 4;
std::cout << " " << _("Block height") << " | " << chainActive.Height() << std::endl; int height;
std::cout << " " << _("Network solution rate") << " | " << GetNetworkHashPS(120, -1) << " Sol/s" << std::endl; size_t connections;
std::cout << " " << _("Connections") << " | " << vNodes.size() << std::endl; int64_t netsolps;
{
LOCK2(cs_main, cs_vNodes);
height = chainActive.Height();
connections = vNodes.size();
netsolps = GetNetworkHashPS(120, -1);
}
auto localsolps = GetLocalSolPS();
std::cout << " " << _("Block height") << " | " << height << std::endl;
std::cout << " " << _("Connections") << " | " << connections << std::endl;
std::cout << " " << _("Network solution rate") << " | " << netsolps << " Sol/s" << std::endl;
if (mining && miningTimer.running()) {
std::cout << " " << _("Local solution rate") << " | " << strprintf("%.4f Sol/s", localsolps) << std::endl;
lines++;
}
std::cout << std::endl; std::cout << std::endl;
return 4; return lines;
} }
int printMiningStatus(bool mining) int printMiningStatus(bool mining)
@ -236,11 +252,8 @@ int printMetrics(size_t cols, bool mining)
} }
if (mining && loaded) { if (mining && loaded) {
double solps = GetLocalSolPS();
std::string strSolps = strprintf("%.4f Sol/s", solps);
std::cout << "- " << strprintf(_("You have contributed %s on average to the network solution rate."), strSolps) << std::endl;
std::cout << "- " << strprintf(_("You have completed %d Equihash solver runs."), ehSolverRuns.get()) << std::endl; std::cout << "- " << strprintf(_("You have completed %d Equihash solver runs."), ehSolverRuns.get()) << std::endl;
lines += 2; lines++;
int mined = 0; int mined = 0;
int orphaned = 0; int orphaned = 0;
@ -395,7 +408,7 @@ void ThreadShowMetricsScreen()
#endif #endif
if (loaded) { if (loaded) {
lines += printNetworkStats(); lines += printStats(mining);
} }
lines += printMiningStatus(mining); lines += printMiningStatus(mining);
lines += printMetrics(cols, mining); lines += printMetrics(cols, mining);