1
0
mirror of https://github.com/xmrig/xmrig.git synced 2026-06-23 20:22:37 -04:00

Merge xmrig v6.7.0 into master

This commit is contained in:
MoneroOcean
2020-12-23 06:03:02 +00:00
249 changed files with 6814 additions and 6134 deletions

View File

@@ -22,6 +22,8 @@
#include "base/crypto/Algorithm.h"
#include "rapidjson/fwd.h"
#include <memory>
namespace xmrig {
class Controller;
@@ -70,7 +72,7 @@ class MoBenchmark : public IJobResultListener {
Job* m_bench_job[BenchAlgo::MAX];
double m_bench_algo_perf[BenchAlgo::MAX];
Controller* m_controller; // to get access to config and network
std::shared_ptr<Controller> m_controller; // to get access to config and network
bool m_isNewBenchRun; // true if benchmark is need to be executed or was executed
MoBenchmark::BenchAlgo m_bench_algo; // current perf algo we benchmark
uint64_t m_hash_count; // number of hashes calculated for current perf algo
@@ -90,7 +92,7 @@ class MoBenchmark : public IJobResultListener {
MoBenchmark();
virtual ~MoBenchmark();
void set_controller(Controller* controller) { m_controller = controller; }
void set_controller(std::shared_ptr<Controller> controller) { m_controller = controller; }
void start(); // start benchmarks