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

Implemented dynamic pool reload.

Browse source
This commit is contained in:
XMRig 2019-02-17 19:29:33 +07:00
parent 7c789a0d3c
commit 9c088eabc2
5 changed files with 59 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/net/Network.cpp
View file

@ -47,6 +47,7 @@ xmrig::Network::Network(Controller *controller) :
m_donate(nullptr)
{
Workers::setListener(this);
controller->addListener(this);
const Pools &pools = controller->config()->pools();
m_strategy = pools.createStrategy(this);
@ -64,6 +65,7 @@ xmrig::Network::Network(Controller *controller) :
xmrig::Network::~Network()
{
delete m_strategy;
}
@ -104,6 +106,22 @@ void xmrig::Network::onActive(IStrategy *strategy, Client *client)
}
void xmrig::Network::onConfigChanged(Config *config, Config *previousConfig)
{
if (config->pools() == previousConfig->pools() || !config->pools().active()) {
return;
}
m_strategy->stop();
config->pools().print();
delete m_strategy;
m_strategy = config->pools().createStrategy(this);
connect();
}
void xmrig::Network::onJob(IStrategy *strategy, Client *client, const Job &job)
{
if (m_donate && m_donate->isActive() && m_donate != strategy) {

42
src/net/Network.h
View file

@ -31,6 +31,7 @@
#include "api/NetworkState.h"
#include "common/interfaces/IControllerListener.h"
#include "common/interfaces/IStrategyListener.h"
#include "interfaces/IJobResultListener.h"
@ -42,36 +43,37 @@ class Controller;
class IStrategy;
class Network : public IJobResultListener, public IStrategyListener
class Network : public IJobResultListener, public IStrategyListener, public IControllerListener
{
public:
Network(Controller *controller);
~Network() override;
Network(Controller *controller);
~Network() override;
void connect();
void stop();
void connect();
void stop();
protected:
void onActive(IStrategy *strategy, Client *client) override;
void onJob(IStrategy *strategy, Client *client, const Job &job) override;
void onJobResult(const JobResult &result) override;
void onPause(IStrategy *strategy) override;
void onResultAccepted(IStrategy *strategy, Client *client, const SubmitResult &result, const char *error) override;
void onActive(IStrategy *strategy, Client *client) override;
void onConfigChanged(Config *config, Config *previousConfig) override;
void onJob(IStrategy *strategy, Client *client, const Job &job) override;
void onJobResult(const JobResult &result) override;
void onPause(IStrategy *strategy) override;
void onResultAccepted(IStrategy *strategy, Client *client, const SubmitResult &result, const char *error) override;
private:
constexpr static int kTickInterval = 1 * 1000;
constexpr static int kTickInterval = 1 * 1000;
bool isColors() const;
void setJob(Client *client, const Job &job, bool donate);
void tick();
bool isColors() const;
void setJob(Client *client, const Job &job, bool donate);
void tick();
static void onTick(uv_timer_t *handle);
static void onTick(uv_timer_t *handle);
Controller *m_controller;
IStrategy *m_donate;
IStrategy *m_strategy;
NetworkState m_state;
uv_timer_t m_timer;
Controller *m_controller;
IStrategy *m_donate;
IStrategy *m_strategy;
NetworkState m_state;
uv_timer_t m_timer;
};