boost: drop boost threads from torcontrol

theuni · theuni · commit 08272671d221 · 2018-02-08T14:35:29.000-05:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -1665,7 +1665,7 @@ bool AppInitMain()
     LogPrintf("nBestHeight = %d\n", chain_active_height);
 
     if (gArgs.GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION))
-        StartTorControl(threadGroup, scheduler);
+        StartTorControl();
 
     Discover();
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
@@ -731,7 +731,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()
 {
@@ -740,7 +740,7 @@ static void TorControlThread()
     event_base_dispatch(gBase);
 }
 
-void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler)
+void StartTorControl()
 {
     assert(!gBase);
 #ifdef WIN32
@@ -754,7 +754,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()
diff --git a/src/torcontrol.h b/src/torcontrol.h
@@ -13,7 +13,7 @@
 extern const std::string DEFAULT_TOR_CONTROL;
 static const bool DEFAULT_LISTEN_ONION = true;
 
-void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler);
+void StartTorControl();
 void InterruptTorControl();
 void StopTorControl();
 

Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,7 @@ void TorController::reconnect_cb(evutil_socket_t fd, short what, void *arg)`
`731`	`731`
`732`	`732`	`/**** Thread ******/`
`733`	`733`	`static struct event_base *gBase;`
`734`		`-static boost::thread torControlThread;`
	`734`	`+static std::thread torControlThread;`
`735`	`735`
`736`	`736`	`static void TorControlThread()`
`737`	`737`	`{`
`@@ -740,7 +740,7 @@ static void TorControlThread()`
`740`	`740`	`event_base_dispatch(gBase);`
`741`	`741`	`}`
`742`	`742`
`743`		`-void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler)`
	`743`	`+void StartTorControl()`
`744`	`744`	`{`
`745`	`745`	`assert(!gBase);`
`746`	`746`	`#ifdef WIN32`
`@@ -754,7 +754,7 @@ void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler)`
`754`	`754`	`return;`
`755`	`755`	`}`
`756`	`756`
`757`		`- torControlThread = boost::thread(boost::bind(&TraceThread<void (*)()>, "torcontrol", &TorControlThread));`
	`757`	`+ torControlThread = std::thread(std::bind(&TraceThread<void (*)()>, "torcontrol", &TorControlThread));`
`758`	`758`	`}`
`759`	`759`
`760`	`760`	`void InterruptTorControl()`