Merge pull request #339 from lostystyg/0.21

Improved stopping pocketcoind for 0.21
pocketnetteam · Jul 22, 2022 · c6fa67b · c6fa67b
2 parents 9b216d7 + e55b604
commit c6fa67b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -274,6 +274,9 @@ void Shutdown(NodeContext& node)
     // CScheduler/checkqueue, threadGroup and load block thread.
     if (node.scheduler) node.scheduler->stop();
     if (g_load_block.joinable()) g_load_block.join();
+    #ifdef ENABLE_WALLET
+    Staker::getInstance()->stop();
+    #endif
     threadGroup.interrupt_all();
     threadGroup.join_all();
 

diff --git a/src/staker.cpp b/src/staker.cpp
@@ -59,6 +59,7 @@ void Staker::startWorkers(
 {
     if (workersStarted) { return; }
     workersStarted = true;
+    m_interrupt.reset();
 
     this->minerSleep = minerSleep;
     threadGroup.create_thread(
@@ -104,7 +105,7 @@ void Staker::run(const util::Ref& context, CChainParams const& chainparams, boos
             }
         }
 
-        UninterruptibleSleep(std::chrono::milliseconds{minerSleep * 10});
+        m_interrupt.sleep_for(std::chrono::milliseconds{minerSleep * 10});
     }
 }
 
@@ -136,7 +137,7 @@ void Staker::worker(const util::Ref& context, CChainParams const& chainparams, s
             while (wallet->IsLocked())
             {
                 nLastCoinStakeSearchInterval = 0;
-                UninterruptibleSleep(std::chrono::milliseconds{1000});
+                m_interrupt.sleep_for(std::chrono::milliseconds{1000});
             }
 
             if (gArgs.GetBoolArg("-stakingrequirespeers", DEFAULT_STAKINGREQUIRESPEERS))
@@ -151,7 +152,7 @@ void Staker::worker(const util::Ref& context, CChainParams const& chainparams, s
                     if (!fvNodesEmpty && !::ChainstateActive().IsInitialBlockDownload())
                         break;
 
-                    UninterruptibleSleep(std::chrono::milliseconds{1000});
+                    m_interrupt.sleep_for(std::chrono::milliseconds{1000});
                 } while (true);
             }
 
@@ -160,15 +161,15 @@ void Staker::worker(const util::Ref& context, CChainParams const& chainparams, s
                 if (ShutdownRequested())
                     break;
 
-                UninterruptibleSleep(std::chrono::milliseconds{1000});
+                m_interrupt.sleep_for(std::chrono::milliseconds{1000});
             }
 
             while (chainparams.GetConsensus().nPosFirstBlock > ::ChainActive().Tip()->nHeight)
             {
                 if (ShutdownRequested())
                     break;
 
-                UninterruptibleSleep(std::chrono::milliseconds{30000});
+                m_interrupt.sleep_for(std::chrono::milliseconds{30000});
             }
 
             uint64_t nFees = 0;
@@ -193,15 +194,10 @@ void Staker::worker(const util::Ref& context, CChainParams const& chainparams, s
             }
             else
             {
-                UninterruptibleSleep(std::chrono::milliseconds{minerSleep});
+                m_interrupt.sleep_for(std::chrono::milliseconds{minerSleep});
             }
         }
     }
-    catch (const boost::thread_interrupted&)
-    {
-        LogPrintf("Staker worker thread terminated\n");
-        throw;
-    }
     catch (const std::runtime_error& e)
     {
         LogPrintf("Staker worker thread runtime error: %s\n", e.what());
@@ -315,3 +311,13 @@ bool Staker::signBlock(std::shared_ptr<CBlock> block, std::shared_ptr<CWallet> w
 #endif
     return false;
 }
+
+
+void Staker::stop()
+{
+    // TODO (losty): this should be called only after shutdown requested
+    //               because otherwise sleeps will be just skipped but thread will
+    //               not exited from it's loop that can result in very big cpu consumption. Probably exit
+    //               loop by checking "if (m_interrupt)" instead of checking for ShutdownRequested?
+    m_interrupt();
+}
diff --git a/src/staker.h b/src/staker.h
@@ -5,6 +5,7 @@
 #ifndef POCKETCOIN_STAKER_H
 #define POCKETCOIN_STAKER_H
 
+#include "threadinterrupt.h"
 #include <boost/thread.hpp>
 #include <chainparams.h>
 #include <util/ref.h>
@@ -39,7 +40,10 @@ class Staker
 
     bool signBlock(std::shared_ptr<CBlock>, std::shared_ptr<CWallet>, int64_t);
 
+    void stop();
+
 private:
+    CThreadInterrupt m_interrupt;
     Staker();
 
     Staker(Staker const&);

diff --git a/src/statistic.hpp b/src/statistic.hpp
@@ -284,12 +284,14 @@ namespace Statistic
         void Run(boost::thread_group& threadGroup, const util::Ref& context)
         {
             shutdown = false;
+            m_interrupt.reset();
             threadGroup.create_thread(boost::bind(&RequestStatEngine::PeriodicStatLogger, this, boost::cref(context)));
         }
 
         void Stop()
         {
             shutdown = true;
+            m_interrupt();
         }
 
         void PeriodicStatLogger(const util::Ref& context)
@@ -305,11 +307,12 @@ namespace Statistic
                     CompileStatsAsJsonSince(chunkSize, context).write(1));
 
                 RemoveSamplesBefore(chunkSize * 2);
-                UninterruptibleSleep(std::chrono::milliseconds{statLoggerSleep});
+                m_interrupt.sleep_for(std::chrono::milliseconds{statLoggerSleep});
             }
         }
 
     private:
+        CThreadInterrupt m_interrupt;
         std::vector<RequestSample> _samples;
         Mutex _samplesLock;
         bool shutdown = false;