Sync changes.

This commit is contained in:
XMRig 2019-02-18 19:02:40 +07:00
parent b7c17cf1a0
commit 84f85b4200
3 changed files with 14 additions and 22 deletions

View file

@ -96,7 +96,6 @@ int xmrig::App::exec()
if (m_controller->config()->isDryRun()) { if (m_controller->config()->isDryRun()) {
LOG_NOTICE("OK"); LOG_NOTICE("OK");
release();
return 0; return 0;
} }
@ -123,7 +122,6 @@ int xmrig::App::exec()
const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT); const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
uv_loop_close(uv_default_loop()); uv_loop_close(uv_default_loop());
release();
return r; return r;
} }
@ -194,8 +192,3 @@ void xmrig::App::close()
uv_stop(uv_default_loop()); uv_stop(uv_default_loop());
} }
void xmrig::App::release()
{
}

View file

@ -47,24 +47,23 @@ class Signals;
class App : public IConsoleListener, public ISignalListener class App : public IConsoleListener, public ISignalListener
{ {
public: public:
App(Process *process); App(Process *process);
~App() override; ~App() override;
int exec(); int exec();
protected: protected:
void onConsoleCommand(char command) override; void onConsoleCommand(char command) override;
void onSignal(int signum) override; void onSignal(int signum) override;
private: private:
void background(); void background();
void close(); void close();
void release();
Console *m_console; Console *m_console;
Controller *m_controller; Controller *m_controller;
Httpd *m_httpd; Httpd *m_httpd;
Signals *m_signals; Signals *m_signals;
}; };

View file

@ -47,9 +47,9 @@ class xmrig::ControllerPrivate
{ {
public: public:
inline ControllerPrivate(Process *process) : inline ControllerPrivate(Process *process) :
config(nullptr),
network(nullptr), network(nullptr),
process(process), process(process)
config(nullptr)
{} {}
@ -60,10 +60,10 @@ public:
} }
Config *config;
Network *network; Network *network;
Process *process; Process *process;
std::vector<IControllerListener *> listeners; std::vector<IControllerListener *> listeners;
Config *config;
}; };