Added real graceful exit.

src/net/Network.cpp

@@ -35,6 +35,7 @@
 #include "base/net/stratum/Client.h"
 #include "base/net/stratum/SubmitResult.h"
 #include "base/tools/Chrono.h"
+#include "base/tools/Handle.h"
 #include "common/log/Log.h"
 #include "core/Config.h"
 #include "core/Controller.h"
@@ -44,7 +45,8 @@
 
 
 xmrig::Network::Network(Controller *controller) :
-    m_donate(nullptr)
+    m_donate(nullptr),
+    m_timer(nullptr)
 {
     Workers::setListener(this);
     controller->addListener(this);
@@ -56,15 +58,21 @@ xmrig::Network::Network(Controller *controller) :
         m_donate = new DonateStrategy(controller->config()->donateLevel(), pools.data().front().user(), controller->config()->algorithm().algo(), this);
     }
 
-    m_timer.data = this;
-    uv_timer_init(uv_default_loop(), &m_timer);
-
-    uv_timer_start(&m_timer, Network::onTick, kTickInterval, kTickInterval);
+    m_timer = new uv_timer_t;
+    m_timer->data = this;
+    uv_timer_init(uv_default_loop(), m_timer);
+    uv_timer_start(m_timer, Network::onTick, kTickInterval, kTickInterval);
 }
 
 
 xmrig::Network::~Network()
 {
+    Handle::close(m_timer);
+
+    if (m_donate) {
+        delete m_donate;
+    }
+
     delete m_strategy;
 }
 
@@ -75,16 +83,6 @@ void xmrig::Network::connect()
 }
 
 
-void xmrig::Network::stop()
-{
-    if (m_donate) {
-        m_donate->stop();
-    }
-
-    m_strategy->stop();
-}
-
-
 void xmrig::Network::onActive(IStrategy *strategy, Client *client)
 {
     if (m_donate && m_donate == strategy) {

src/net/Network.h

@@ -50,7 +50,6 @@ public:
     ~Network() override;
 
     void connect();
-    void stop();
 
 protected:
     void onActive(IStrategy *strategy, Client *client) override;
@@ -72,7 +71,7 @@ private:
     IStrategy *m_donate;
     IStrategy *m_strategy;
     NetworkState m_state;
-    uv_timer_t m_timer;
+    uv_timer_t *m_timer;
 };
 
 

src/net/strategies/DonateStrategy.cpp

@@ -28,6 +28,7 @@
 #include "base/net/stratum/strategies/FailoverStrategy.h"
 #include "base/net/stratum/strategies/SinglePoolStrategy.h"
 #include "base/tools/Buffer.h"
+#include "base/tools/Handle.h"
 #include "common/crypto/keccak.h"
 #include "common/Platform.h"
 #include "common/xmrig.h"
@@ -71,8 +72,9 @@ xmrig::DonateStrategy::DonateStrategy(int level, const char *user, Algo algo, IS
         m_strategy = new SinglePoolStrategy(m_pools.front(), 1, 2, this, true);
     }
 
-    m_timer.data = this;
-    uv_timer_init(uv_default_loop(), &m_timer);
+    m_timer = new uv_timer_t;
+    m_timer->data = this;
+    uv_timer_init(uv_default_loop(), m_timer);
 
     idle(m_idleTime * randomf(0.5, 1.5));
 }
@@ -80,6 +82,7 @@ xmrig::DonateStrategy::DonateStrategy(int level, const char *user, Algo algo, IS
 
 xmrig::DonateStrategy::~DonateStrategy()
 {
+    Handle::close(m_timer);
     delete m_strategy;
 }
 
@@ -104,7 +107,7 @@ void xmrig::DonateStrategy::setAlgo(const xmrig::Algorithm &algo)
 
 void xmrig::DonateStrategy::stop()
 {
-    uv_timer_stop(&m_timer);
+    uv_timer_stop(m_timer);
     m_strategy->stop();
 }
 
@@ -125,7 +128,7 @@ void xmrig::DonateStrategy::tick(uint64_t now)
 void xmrig::DonateStrategy::onActive(IStrategy *strategy, Client *client)
 {
     if (!isActive()) {
-        uv_timer_start(&m_timer, DonateStrategy::onTimer, m_donateTime, 0);
+        uv_timer_start(m_timer, DonateStrategy::onTimer, m_donateTime, 0);
     }
 
     m_active = true;
@@ -154,7 +157,7 @@ void xmrig::DonateStrategy::onResultAccepted(IStrategy *strategy, Client *client
 
 void xmrig::DonateStrategy::idle(uint64_t timeout)
 {
-    uv_timer_start(&m_timer, DonateStrategy::onTimer, timeout, 0);
+    uv_timer_start(m_timer, DonateStrategy::onTimer, timeout, 0);
 }
 
 

src/net/strategies/DonateStrategy.h

@@ -79,7 +79,7 @@ private:
     std::vector<Pool> m_pools;
     uint64_t m_now;
     uint64_t m_stop;
-    uv_timer_t m_timer;
+    uv_timer_t *m_timer;
 };