fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge xmrig v6.14.1 into master

Browse source
This commit is contained in:
MoneroOcean 2021-08-15 04:41:24 +00:00
parent efb40419e8
commit 13bb0f14e1
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/MoBenchmark.cpp
View file

@ -58,7 +58,7 @@ void MoBenchmark::start() {
// end of benchmarks, switch to jobs from the pool (network), fill algo_perf // end of benchmarks, switch to jobs from the pool (network), fill algo_perf
void MoBenchmark::finish() { void MoBenchmark::finish() {
for (const Id algo : Algorithm::all([this](const Algorithm &algo) { return true; })) { for (const Algorithm::Id algo : Algorithm::all([this](const Algorithm &algo) { return true; })) {
algo_perf[algo] = get_algo_perf(algo); algo_perf[algo] = get_algo_perf(algo);
} }
m_bench_algo = BenchAlgo::INVALID; m_bench_algo = BenchAlgo::INVALID;
@ -86,7 +86,7 @@ rapidjson::Value MoBenchmark::toJSON(rapidjson::Document &doc) const
void MoBenchmark::read(const rapidjson::Value &value) void MoBenchmark::read(const rapidjson::Value &value)
{ {
for (const Id algo : Algorithm::all([this](const Algorithm &algo) { return true; })) { for (const Algorithm::Id algo : Algorithm::all([this](const Algorithm&) { return true; })) {
algo_perf[algo] = 0.0f; algo_perf[algo] = 0.0f;
} }
if (value.IsObject()) { if (value.IsObject()) {

2
src/core/MoBenchmark.h
View file

@ -96,7 +96,7 @@ class MoBenchmark : public IJobResultListener {
void start(); // start benchmarks void start(); // start benchmarks
bool isNewBenchRun() const { return m_isNewBenchRun; } bool isNewBenchRun() const { return m_isNewBenchRun; }
std::map<Algorithm::Id, double> algo_perf; mutable std::map<Algorithm::Id, double> algo_perf;
rapidjson::Value toJSON(rapidjson::Document &doc) const; rapidjson::Value toJSON(rapidjson::Document &doc) const;
void read(const rapidjson::Value &value); void read(const rapidjson::Value &value);