mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-27 14:23:28 -05:00
Code Issues Projects Releases Wiki Activity

Cleanup MoneroOcean patchset

Browse Source
This commit is contained in:
Tony Butler
2020-06-08 15:02:38 -06:00
committed by MoneroOcean
parent 42235a56da
commit 30fdc92884
28 changed files with 6138 additions and 6122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/config/Config.cpp
View File

@@ -166,7 +166,13 @@ bool xmrig::Config::isShouldSave() const
}
# endif
return (m_upgrade || cpu().isShouldSave() || m_benchmark.isNewBenchRun());
# ifdef XMRIG_FEATURE_BENCHMARK
if (m_benchmark.isNewBenchRun()) {
return true;
}
# endif
return (m_upgrade || cpu().isShouldSave());
}
@@ -177,7 +183,6 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName)
}
d_ptr->cpu.read(reader.getValue(kCPU));
m_benchmark.read(reader.getValue("algo-perf"));
# ifdef XMRIG_ALGO_RANDOMX
if (!d_ptr->rx.read(reader.getValue(kRandomX))) {
@@ -197,6 +202,10 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName)
d_ptr->healthPrintTime = reader.getUint(kHealthPrintTime, d_ptr->healthPrintTime);
# endif
# ifdef XMRIG_FEATURE_BENCHMARK
m_benchmark.read(reader.getValue(kAlgoPerf));
# endif
return true;
}
@@ -254,7 +263,9 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
doc.AddMember(StringRef(kVerbose), Log::verbose(), allocator);
doc.AddMember(StringRef(kWatch), m_watch, allocator);
doc.AddMember("algo-perf", m_benchmark.toJSON(doc), allocator);
doc.AddMember("rebench-algo", isRebenchAlgo(), allocator);
doc.AddMember("bench-algo-time", benchAlgoTime(), allocator);
# ifdef XMRIG_FEATURE_BENCHMARK
doc.AddMember(StringRef(kRebenchAlgo), isRebenchAlgo(), allocator);
doc.AddMember(StringRef(kBenchAlgoTime), benchAlgoTime(), allocator);
doc.AddMember(StringRef(kAlgoPerf), m_benchmark.toJSON(doc), allocator);
# endif
}

9
src/core/config/Config.h
View File

@@ -33,7 +33,9 @@
#include "backend/cpu/CpuConfig.h"
#include "base/kernel/config/BaseConfig.h"
#include "base/tools/Object.h"
#ifdef XMRIG_FEATURE_BENCHMARK
#include "core/Benchmark.h"
#endif
namespace xmrig {
@@ -59,7 +61,6 @@ public:
# ifdef XMRIG_FEATURE_OPENCL
const OclConfig &cl() const;
# endif
inline Benchmark &benchmark() { return m_benchmark; }
# ifdef XMRIG_FEATURE_CUDA
const CudaConfig &cuda() const;
@@ -79,9 +80,15 @@ public:
bool read(const IJsonReader &reader, const char *fileName) override;
void getJSON(rapidjson::Document &doc) const override;
# ifdef XMRIG_FEATURE_BENCHMARK
inline Benchmark &benchmark() { return m_benchmark; }
# endif
private:
ConfigPrivate *d_ptr;
# ifdef XMRIG_FEATURE_BENCHMARK
Benchmark m_benchmark;
# endif
};