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-14 20:33:50 +00:00
parent 9d0d6ad9b6
commit 945a9cbcb9
2 changed files with 4 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
void MoBenchmark::finish() {
for (Algorithm::Id algo = Algorithm::MIN; algo != Algorithm::MAX; algo = static_cast<Algorithm::Id>(algo + 1)) {
for (const Id algo : Algorithm::all([this](const Algorithm &algo) { return true; })) {
algo_perf[algo] = get_algo_perf(algo);
}
m_bench_algo = BenchAlgo::INVALID;
@ -86,7 +86,7 @@ rapidjson::Value MoBenchmark::toJSON(rapidjson::Document &doc) const
void MoBenchmark::read(const rapidjson::Value &value)
{
for (Algorithm::Id algo = Algorithm::MIN; algo != Algorithm::MAX; algo = static_cast<Algorithm::Id>(algo + 1)) {
for (const Id algo : Algorithm::all([this](const Algorithm &algo) { return true; })) {
algo_perf[algo] = 0.0f;
}
if (value.IsObject()) {

3
src/core/MoBenchmark.h
View file

@ -18,6 +18,7 @@
#pragma once
#include <set>
#include <map>
#include "net/interfaces/IJobResultListener.h"
#include "base/crypto/Algorithm.h"
#include "rapidjson/fwd.h"
@ -95,7 +96,7 @@ class MoBenchmark : public IJobResultListener {
void start(); // start benchmarks
bool isNewBenchRun() const { return m_isNewBenchRun; }
double algo_perf[Algorithm::MAX];
std::map<Algorithm::Id, double> algo_perf;
rapidjson::Value toJSON(rapidjson::Document &doc) const;
void read(const rapidjson::Value &value);