Drop boost threads for torcontrol

Fuzzbawls · Fuzzbawls · commit c01468a54e51 · 2020-11-10T17:06:05.000-08:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -234,6 +234,8 @@ void PrepareShutdown()
     peerLogic.reset();
     g_connman.reset();
 
+    StopTorControl();
+
     DumpMasternodes();
     DumpBudgets(g_budgetman);
     DumpMasternodePayments();
@@ -315,8 +317,6 @@ void Shutdown()
     if (!fRestartRequested) {
         PrepareShutdown();
     }
-    // Shutdown part 2: Stop TOR thread and delete wallet instance
-    StopTorControl();
 #ifdef ENABLE_WALLET
     delete pwalletMain;
     pwalletMain = NULL;
@@ -1865,7 +1865,7 @@ bool AppInit2()
 #endif
 
     if (gArgs.GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION))
-        StartTorControl(threadGroup);
+        StartTorControl();
 
     Discover(threadGroup);
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
@@ -733,7 +733,7 @@ void TorController::reconnect_cb(evutil_socket_t fd, short what, void *arg)
 
 /****** Thread ********/
 static struct event_base *gBase;
-static boost::thread torControlThread;
+static std::thread torControlThread;
 
 static void TorControlThread()
 {
@@ -742,7 +742,7 @@ static void TorControlThread()
     event_base_dispatch(gBase);
 }
 
-void StartTorControl(boost::thread_group& threadGroup/*, CScheduler& scheduler*/)
+void StartTorControl()
 {
     assert(!gBase);
 #ifdef WIN32
@@ -756,7 +756,7 @@ void StartTorControl(boost::thread_group& threadGroup/*, CScheduler& scheduler*/
         return;
     }
 
-    torControlThread = boost::thread(boost::bind(&TraceThread<void (*)()>, "torcontrol", &TorControlThread));
+    torControlThread = std::thread(std::bind(&TraceThread<void (*)()>, "torcontrol", &TorControlThread));
 }
 
 void InterruptTorControl()
@@ -769,11 +769,9 @@ void InterruptTorControl()
 
 void StopTorControl()
 {
-    // try_join_for() avoids the wallet not closing during a repair-restart. For a 'normal' wallet exit
-    // it behaves for our cases exactly like the normal join()
     if (gBase) {
-        torControlThread.try_join_for(boost::chrono::seconds(1));
+        torControlThread.join();
         event_base_free(gBase);
-        gBase = 0;
+        gBase = nullptr;
     }
 }
diff --git a/src/torcontrol.h b/src/torcontrol.h
@@ -11,13 +11,10 @@
 
 #include <string>
 
-#include <boost/chrono/chrono.hpp>
-#include <boost/thread.hpp>
-
 extern const std::string DEFAULT_TOR_CONTROL;
 static const bool DEFAULT_LISTEN_ONION = true;
 
-void StartTorControl(boost::thread_group& threadGroup);
+void StartTorControl();
 void InterruptTorControl();
 void StopTorControl();
 

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ void TorController::reconnect_cb(evutil_socket_t fd, short what, void *arg)`
`733`	`733`
`734`	`734`	`/**** Thread ******/`
`735`	`735`	`static struct event_base *gBase;`
`736`		`-static boost::thread torControlThread;`
	`736`	`+static std::thread torControlThread;`
`737`	`737`
`738`	`738`	`static void TorControlThread()`
`739`	`739`	`{`
`@@ -742,7 +742,7 @@ static void TorControlThread()`
`742`	`742`	`event_base_dispatch(gBase);`
`743`	`743`	`}`
`744`	`744`
`745`		`-void StartTorControl(boost::thread_group& threadGroup/, CScheduler& scheduler/)`
	`745`	`+void StartTorControl()`
`746`	`746`	`{`
`747`	`747`	`assert(!gBase);`
`748`	`748`	`#ifdef WIN32`
`@@ -756,7 +756,7 @@ void StartTorControl(boost::thread_group& threadGroup/, CScheduler& scheduler/`
`756`	`756`	`return;`
`757`	`757`	`}`
`758`	`758`
`759`		`- torControlThread = boost::thread(boost::bind(&TraceThread<void (*)()>, "torcontrol", &TorControlThread));`
	`759`	`+ torControlThread = std::thread(std::bind(&TraceThread<void (*)()>, "torcontrol", &TorControlThread));`
`760`	`760`	`}`
`761`	`761`
`762`	`762`	`void InterruptTorControl()`
`@@ -769,11 +769,9 @@ void InterruptTorControl()`
`769`	`769`
`770`	`770`	`void StopTorControl()`
`771`	`771`	`{`
`772`		`- // try_join_for() avoids the wallet not closing during a repair-restart. For a 'normal' wallet exit`
`773`		`- // it behaves for our cases exactly like the normal join()`
`774`	`772`	`if (gBase) {`
`775`		`- torControlThread.try_join_for(boost::chrono::seconds(1));`
	`773`	`+ torControlThread.join();`
`776`	`774`	`event_base_free(gBase);`
`777`		`- gBase = 0;`
	`775`	`+ gBase = nullptr;`
`778`	`776`	`}`
`779`	`777`	`}`