Use a new local scheduler instead of the global one

PIVX-Project · Sep 13, 2023 · 81c46c0 · 81c46c0
1 parent 9eee614
commit 81c46c0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1541,7 +1541,7 @@ bool AppInitMain()
                 // The on-disk coinsdb is now in a good state, create the cache
                 pcoinsTip.reset(new CCoinsViewCache(pcoinscatcher.get()));
 
-                InitTierTwoPostCoinsCacheLoad(&scheduler);
+                InitTierTwoPostCoinsCacheLoad();
 
                 bool is_coinsview_empty = fReset || fReindexChainState || pcoinsTip->GetBestBlock().IsNull();
                 if (!is_coinsview_empty) {

diff --git a/src/llmq/quorums_chainlocks.cpp b/src/llmq/quorums_chainlocks.cpp
@@ -14,6 +14,7 @@
 #include "spork.h"
 #include "sporkid.h"
 #include "validation.h"
+#include <boost/thread/detail/thread.hpp>
 
 namespace llmq
 {
@@ -27,13 +28,19 @@ std::string CChainLockSig::ToString() const
     return strprintf("CChainLockSig(nHeight=%d, blockHash=%s)", nHeight, blockHash.ToString());
 }
 
-CChainLocksHandler::CChainLocksHandler(CScheduler* _scheduler) :
-    scheduler(_scheduler)
+CChainLocksHandler::CChainLocksHandler()
 {
+    scheduler = new CScheduler();
+    CScheduler::Function serviceLoop = boost::bind(&CScheduler::serviceQueue, scheduler);
+    scheduler_thread = new boost::thread(boost::bind(&TraceThread<CScheduler::Function>, "chainlock-scheduler", serviceLoop));
 }
 
 CChainLocksHandler::~CChainLocksHandler()
 {
+    scheduler_thread->interrupt();
+    scheduler_thread->join();
+    delete scheduler_thread;
+    delete scheduler;
 }
 
 void CChainLocksHandler::Start()
@@ -47,6 +54,7 @@ void CChainLocksHandler::Start()
 
 void CChainLocksHandler::Stop()
 {
+    scheduler->stop();
     quorumSigningManager->UnregisterRecoveredSigsListener(this);
 }
 

diff --git a/src/llmq/quorums_chainlocks.h b/src/llmq/quorums_chainlocks.h
@@ -45,6 +45,7 @@ class CChainLocksHandler : public CRecoveredSigsListener
 
 private:
     CScheduler* scheduler;
+    boost::thread* scheduler_thread;
     RecursiveMutex cs;
     bool tryLockChainTipScheduled GUARDED_BY(cs) {false};
 
@@ -63,7 +64,7 @@ class CChainLocksHandler : public CRecoveredSigsListener
     int64_t lastCleanupTime{0};
 
 public:
-    CChainLocksHandler(CScheduler* _scheduler);
+    CChainLocksHandler();
     ~CChainLocksHandler();
 
     void Start();

diff --git a/src/llmq/quorums_init.cpp b/src/llmq/quorums_init.cpp
@@ -19,7 +19,7 @@ namespace llmq
 
 CBLSWorker* blsWorker;
 
-void InitLLMQSystem(CEvoDB& evoDb, CScheduler* scheduler, bool unitTests)
+void InitLLMQSystem(CEvoDB& evoDb, bool unitTests)
 {
     blsWorker = new CBLSWorker();
 
@@ -29,7 +29,7 @@ void InitLLMQSystem(CEvoDB& evoDb, CScheduler* scheduler, bool unitTests)
     quorumManager.reset(new CQuorumManager(evoDb, *blsWorker, *quorumDKGSessionManager));
     quorumSigSharesManager = new CSigSharesManager();
     quorumSigningManager = new CSigningManager(unitTests);
-    chainLocksHandler = new CChainLocksHandler(scheduler);
+    chainLocksHandler = new CChainLocksHandler();
 }
 
 void DestroyLLMQSystem()

diff --git a/src/llmq/quorums_init.h b/src/llmq/quorums_init.h
@@ -15,7 +15,7 @@ namespace llmq
 {
 
 // Init/destroy LLMQ globals
-void InitLLMQSystem(CEvoDB& evoDb, CScheduler* scheduler, bool unitTests);
+void InitLLMQSystem(CEvoDB& evoDb, bool unitTests);
 void DestroyLLMQSystem();
 
 // Manage scheduled tasks, threads, listeners etc.

diff --git a/src/tiertwo/init.cpp b/src/tiertwo/init.cpp
@@ -71,10 +71,10 @@ void InitTierTwoPreChainLoad(bool fReindex)
     deterministicMNManager.reset(new CDeterministicMNManager(*evoDb));
 }
 
-void InitTierTwoPostCoinsCacheLoad(CScheduler* scheduler)
+void InitTierTwoPostCoinsCacheLoad()
 {
     // Initialize LLMQ system
-    llmq::InitLLMQSystem(*evoDb, scheduler, false);
+    llmq::InitLLMQSystem(*evoDb, false);
 }
 
 void InitTierTwoChainTip()

diff --git a/src/tiertwo/init.h b/src/tiertwo/init.h
@@ -28,7 +28,7 @@ void ResetTierTwoInterfaces();
 void InitTierTwoPreChainLoad(bool fReindex);
 
 /** Inits the tier two global objects that require access to the coins tip cache */
-void InitTierTwoPostCoinsCacheLoad(CScheduler* scheduler);
+void InitTierTwoPostCoinsCacheLoad();
 
 /** Initialize chain tip */
 void InitTierTwoChainTip();