From 84f85b42006d7316b663b3da3926861d413c7e91 Mon Sep 17 00:00:00 2001 From: XMRig Date: Mon, 18 Feb 2019 19:02:40 +0700 Subject: [PATCH] Sync changes. --- src/App.cpp | 7 ------- src/App.h | 23 +++++++++++------------ src/core/Controller.cpp | 6 +++--- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/App.cpp b/src/App.cpp index 31691fbf3..96d1688ba 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -96,7 +96,6 @@ int xmrig::App::exec() if (m_controller->config()->isDryRun()) { LOG_NOTICE("OK"); - release(); return 0; } @@ -123,7 +122,6 @@ int xmrig::App::exec() const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT); uv_loop_close(uv_default_loop()); - release(); return r; } @@ -194,8 +192,3 @@ void xmrig::App::close() uv_stop(uv_default_loop()); } - - -void xmrig::App::release() -{ -} diff --git a/src/App.h b/src/App.h index 3a1777979..fc9449673 100644 --- a/src/App.h +++ b/src/App.h @@ -47,24 +47,23 @@ class Signals; class App : public IConsoleListener, public ISignalListener { public: - App(Process *process); - ~App() override; + App(Process *process); + ~App() override; - int exec(); + int exec(); protected: - void onConsoleCommand(char command) override; - void onSignal(int signum) override; + void onConsoleCommand(char command) override; + void onSignal(int signum) override; private: - void background(); - void close(); - void release(); + void background(); + void close(); - Console *m_console; - Controller *m_controller; - Httpd *m_httpd; - Signals *m_signals; + Console *m_console; + Controller *m_controller; + Httpd *m_httpd; + Signals *m_signals; }; diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index 766ddbab6..1b30b4cdc 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -47,9 +47,9 @@ class xmrig::ControllerPrivate { public: inline ControllerPrivate(Process *process) : + config(nullptr), network(nullptr), - process(process), - config(nullptr) + process(process) {} @@ -60,10 +60,10 @@ public: } + Config *config; Network *network; Process *process; std::vector listeners; - Config *config; };