DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Improve locking in metrics

Browse Source
This commit is contained in:
Jack Grigg
2016-11-01 11:59:40 -05:00
parent 24f1026689
commit cb7098317d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/metrics.cpp
View File

@@ -17,6 +17,8 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>
CCriticalSection cs_metrics;
AtomicCounter transactionsValidated; AtomicCounter transactionsValidated;
AtomicCounter ehSolverRuns; AtomicCounter ehSolverRuns;
AtomicCounter solutionTargetChecks; AtomicCounter solutionTargetChecks;
@@ -32,6 +34,7 @@ extern int64_t GetNetworkHashPS(int lookup, int height);
void TrackMinedBlock(uint256 hash) void TrackMinedBlock(uint256 hash)
{ {
LOCK(cs_metrics);
minedBlocks.increment(); minedBlocks.increment();
trackedBlocks->push_back(hash); trackedBlocks->push_back(hash);
} }
@@ -151,9 +154,10 @@ int printMetrics(size_t cols, int64_t nStart, bool mining)
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 += 2;
int mined = minedBlocks.get(); int mined = 0;
if (mined > 0) { int orphaned = 0;
LOCK(cs_main); {
LOCK2(cs_main, cs_metrics);
boost::strict_lock_ptr<std::list<uint256>> u = trackedBlocks.synchronize(); boost::strict_lock_ptr<std::list<uint256>> u = trackedBlocks.synchronize();
auto consensusParams = Params().GetConsensus(); auto consensusParams = Params().GetConsensus();
auto tipHeight = chainActive.Height(); auto tipHeight = chainActive.Height();
@@ -180,8 +184,12 @@ int printMetrics(size_t cols, int64_t nStart, bool mining)
it = u->erase(it); it = u->erase(it);
} }
} }
int orphaned = mined - u->size();
mined = minedBlocks.get();
orphaned = mined - u->size();
}
if (mined > 0) {
std::cout << "- " << strprintf(_("You have mined %d blocks!"), mined) << std::endl; std::cout << "- " << strprintf(_("You have mined %d blocks!"), mined) << std::endl;
std::cout << " " std::cout << " "
<< strprintf(_("Orphaned: %d blocks, Immature: %u %s, Mature: %u %s"), << strprintf(_("Orphaned: %d blocks, Immature: %u %s, Mature: %u %s"),