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

Merged v4.0.0-beta

Browse source
This commit is contained in:
MoneroOcean 2019-09-17 15:48:01 -07:00
commit 993733cb1f
231 changed files with 32642 additions and 3380 deletions
Download patch file Download diff file Expand all files Collapse all files

106
src/core/Miner.cpp
View file

@ -24,8 +24,8 @@
#include <algorithm>
#include <mutex>
#include <thread>
#include <uv.h>
#include "backend/common/Hashrate.h"
@ -34,6 +34,7 @@
#include "base/io/log/Log.h"
#include "base/kernel/Platform.h"
#include "base/net/stratum/Job.h"
#include "base/tools/Object.h"
#include "base/tools/Timer.h"
#include "core/config/Config.h"
#include "core/Controller.h"
@ -50,16 +51,29 @@
#endif
#ifdef XMRIG_FEATURE_OPENCL
# include "backend/opencl/OclBackend.h"
#endif
#ifdef XMRIG_ALGO_RANDOMX
# include "crypto/rx/RxConfig.h"
#endif
namespace xmrig {
static std::mutex mutex;
class MinerPrivate
{
public:
XMRIG_DISABLE_COPY_MOVE_DEFAULT(MinerPrivate)
inline MinerPrivate(Controller *controller) : controller(controller)
{
uv_rwlock_init(&rwlock);
# ifdef XMRIG_ALGO_RANDOMX
Rx::init();
# endif
@ -68,8 +82,6 @@ public:
inline ~MinerPrivate()
{
uv_rwlock_destroy(&rwlock);
delete timer;
for (IBackend *backend : backends) {
@ -108,7 +120,7 @@ public:
}
inline void handleJobChange(bool reset)
inline void handleJobChange()
{
active = true;
@ -135,7 +147,7 @@ public:
# ifdef XMRIG_FEATURE_API
void getMiner(rapidjson::Value &reply, rapidjson::Document &doc, int version) const
void getMiner(rapidjson::Value &reply, rapidjson::Document &doc, int) const
{
using namespace rapidjson;
auto &allocator = doc.GetAllocator();
@ -144,25 +156,6 @@ public:
reply.AddMember("kind", APP_KIND, allocator);
reply.AddMember("ua", StringRef(Platform::userAgent()), allocator);
reply.AddMember("cpu", Cpu::toJSON(doc), allocator);
Value hugepages;
if (!backends.empty() && backends.front()->type() == "cpu") {
const auto pages = static_cast<CpuBackend *>(backends.front())->hugePages();
if (version > 1) {
hugepages.SetArray();
hugepages.PushBack(pages.first, allocator);
hugepages.PushBack(pages.second, allocator);
}
else {
hugepages = pages.first == pages.second;
}
}
else {
hugepages = false;
}
reply.AddMember("hugepages", hugepages, allocator);
reply.AddMember("donate_level", controller->config()->pools().donateLevel(), allocator);
Value algo(kArrayType);
@ -239,10 +232,19 @@ public:
# endif
# ifdef XMRIG_ALGO_RANDOMX
bool initRX(IRxListener *listener)
{
return Rx::init(job, controller->config()->rx().threads(), controller->config()->cpu().isHugePages(), controller->config()->rx().isNUMA(), listener);
}
# endif
Algorithm algorithm;
Algorithms algorithms;
bool active = false;
bool enabled = true;
bool reset = true;
Controller *controller;
Job job;
mutable std::map<Algorithm::Id, double> maxHashrate;
@ -250,7 +252,6 @@ public:
String userJobId;
Timer *timer = nullptr;
uint64_t ticks = 0;
uv_rwlock_t rwlock;
};
@ -271,6 +272,10 @@ xmrig::Miner::Miner(Controller *controller)
d_ptr->backends.push_back(new CpuBackend(controller));
# ifdef XMRIG_FEATURE_OPENCL
d_ptr->backends.push_back(new OclBackend(controller));
# endif
d_ptr->rebuild();
}
@ -307,11 +312,9 @@ const std::vector<xmrig::IBackend *> &xmrig::Miner::backends() const
xmrig::Job xmrig::Miner::job() const
{
uv_rwlock_rdlock(&d_ptr->rwlock);
Job job = d_ptr->job;
uv_rwlock_rdunlock(&d_ptr->rwlock);
std::lock_guard<std::mutex> lock(mutex);
return job;
return d_ptr->job;
}
@ -387,12 +390,12 @@ void xmrig::Miner::setJob(const Job &job, bool donate)
d_ptr->algorithm = job.algorithm();
uv_rwlock_wrlock(&d_ptr->rwlock);
mutex.lock();
const uint8_t index = donate ? 1 : 0;
const bool reset = !(d_ptr->job.index() == 1 && index == 0 && d_ptr->userJobId == job.id());
d_ptr->job = job;
d_ptr->reset = !(d_ptr->job.index() == 1 && index == 0 && d_ptr->userJobId == job.id());
d_ptr->job = job;
d_ptr->job.setIndex(index);
if (index == 0) {
@ -400,16 +403,16 @@ void xmrig::Miner::setJob(const Job &job, bool donate)
}
# ifdef XMRIG_ALGO_RANDOMX
Rx::init(d_ptr->job,
d_ptr->controller->config()->rx().threads(),
d_ptr->controller->config()->cpu().isHugePages(),
d_ptr->controller->config()->rx().isNUMA()
);
const bool ready = d_ptr->initRX(this);
# else
constexpr const bool ready = true;
# endif
uv_rwlock_wrunlock(&d_ptr->rwlock);
mutex.unlock();
d_ptr->handleJobChange(reset);
if (ready) {
d_ptr->handleJobChange();
}
}
@ -488,6 +491,27 @@ void xmrig::Miner::onRequest(IApiRequest &request)
setEnabled(true);
}
else if (request.rpcMethod() == "stop") {
request.accept();
stop();
}
}
for (IBackend *backend : d_ptr->backends) {
backend->handleRequest(request);
}
}
#endif
#ifdef XMRIG_ALGO_RANDOMX
void xmrig::Miner::onDatasetReady()
{
if (!Rx::isReady(job())) {
return;
}
d_ptr->handleJobChange();
}
#endif

7
src/core/Miner.h
View file

@ -29,6 +29,7 @@
#include <vector>
#include "backend/common/interfaces/IRxListener.h"
#include "base/api/interfaces/IApiListener.h"
#include "base/kernel/interfaces/IBaseListener.h"
#include "base/kernel/interfaces/ITimerListener.h"
@ -44,7 +45,7 @@ class MinerPrivate;
class IBackend;
class Miner : public ITimerListener, public IBaseListener, public IApiListener
class Miner : public ITimerListener, public IBaseListener, public IApiListener, public IRxListener
{
public:
Miner(Controller *controller);
@ -69,6 +70,10 @@ protected:
void onRequest(IApiRequest &request) override;
# endif
# ifdef XMRIG_ALGO_RANDOMX
void onDatasetReady() override;
# endif
private:
MinerPrivate *d_ptr;
};

85
src/core/config/Config.cpp
View file

@ -38,6 +38,16 @@
#include "rapidjson/prettywriter.h"
#ifdef XMRIG_ALGO_RANDOMX
# include "crypto/rx/RxConfig.h"
#endif
#ifdef XMRIG_FEATURE_OPENCL
# include "backend/opencl/OclConfig.h"
#endif
namespace xmrig {
static const char *kCPU = "cpu";
@ -47,14 +57,62 @@ static constexpr const uint32_t kVersion = 1;
static const char *kRandomX = "randomx";
#endif
#ifdef XMRIG_FEATURE_OPENCL
static const char *kOcl = "opencl";
#endif
class ConfigPrivate
{
public:
CpuConfig cpu;
# ifdef XMRIG_ALGO_RANDOMX
RxConfig rx;
# endif
# ifdef XMRIG_FEATURE_OPENCL
OclConfig cl;
# endif
};
}
xmrig::Config::Config() : BaseConfig()
xmrig::Config::Config() : BaseConfig(),
d_ptr(new ConfigPrivate())
{
}
xmrig::Config::~Config()
{
delete d_ptr;
}
const xmrig::CpuConfig &xmrig::Config::cpu() const
{
return d_ptr->cpu;
}
#ifdef XMRIG_FEATURE_OPENCL
const xmrig::OclConfig &xmrig::Config::cl() const
{
return d_ptr->cl;
}
#endif
#ifdef XMRIG_ALGO_RANDOMX
const xmrig::RxConfig &xmrig::Config::rx() const
{
return d_ptr->rx;
}
#endif
bool xmrig::Config::isShouldSave() const
{
if (!isAutoSave()) {
@ -65,7 +123,13 @@ bool xmrig::Config::isShouldSave() const
return true;
}
return (m_shouldSave || m_upgrade || m_cpu.isShouldSave() || m_benchmark.isNewBenchRun());
# ifdef XMRIG_FEATURE_OPENCL
if (cl().isShouldSave()) {
return true;
}
# endif
return (m_upgrade || cpu().isShouldSave() || m_benchmark.isNewBenchRun());
}
@ -75,15 +139,19 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName)
return false;
}
m_cpu.read(reader.getValue(kCPU), version());
d_ptr->cpu.read(reader.getValue(kCPU), version());
m_benchmark.read(reader.getValue("algo-perf"));
# ifdef XMRIG_ALGO_RANDOMX
if (!m_rx.read(reader.getValue(kRandomX))) {
if (!d_ptr->rx.read(reader.getValue(kRandomX))) {
m_upgrade = true;
}
# endif
# ifdef XMRIG_FEATURE_OPENCL
d_ptr->cl.read(reader.getValue(kOcl));
# endif
return true;
}
@ -108,10 +176,15 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
doc.AddMember("colors", Log::colors, allocator);
# ifdef XMRIG_ALGO_RANDOMX
doc.AddMember(StringRef(kRandomX), m_rx.toJSON(doc), allocator);
doc.AddMember(StringRef(kRandomX), rx().toJSON(doc), allocator);
# endif
doc.AddMember(StringRef(kCPU), cpu().toJSON(doc), allocator);
# ifdef XMRIG_FEATURE_OPENCL
doc.AddMember(StringRef(kOcl), cl().toJSON(doc), allocator);
# endif
doc.AddMember(StringRef(kCPU), m_cpu.toJSON(doc), allocator);
doc.AddMember("algo-perf", m_benchmark.toJSON(doc), allocator);
doc.AddMember("donate-level", m_pools.donateLevel(), allocator);
doc.AddMember("donate-over-proxy", m_pools.proxyDonate(), allocator);

34
src/core/config/Config.h
View file

@ -35,41 +35,39 @@
#include "rapidjson/fwd.h"
#ifdef XMRIG_ALGO_RANDOMX
# include "crypto/rx/RxConfig.h"
#endif
namespace xmrig {
class ConfigPrivate;
class IThread;
class RxConfig;
class OclConfig;
class Config : public BaseConfig
{
public:
Config();
~Config() override;
const CpuConfig &cpu() const;
# ifdef XMRIG_FEATURE_OPENCL
const OclConfig &cl() const;
# endif
inline Benchmark &benchmark() { return m_benchmark; }
# ifdef XMRIG_ALGO_RANDOMX
const RxConfig &rx() const;
# endif
bool isShouldSave() const;
bool read(const IJsonReader &reader, const char *fileName) override;
void getJSON(rapidjson::Document &doc) const override;
inline const CpuConfig &cpu() const { return m_cpu; }
inline Benchmark &benchmark() { return m_benchmark; }
# ifdef XMRIG_ALGO_RANDOMX
inline const RxConfig &rx() const { return m_rx; }
# endif
private:
bool m_shouldSave = false;
CpuConfig m_cpu;
ConfigPrivate *d_ptr;
Benchmark m_benchmark;
# ifdef XMRIG_ALGO_RANDOMX
RxConfig m_rx;
# endif
};