This doesn’t completely get rid of boost::thread, but this batch should be easy to review, and leaves us with only threadGroup (scheduler + scriptcheck) remaining.
Note to reviewers: The upnp diff changes a bunch of whitespace, it’s much more clear with ‘git diff -w’
314@@ -315,7 +315,11 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
315 break;
316 case MapPortUPnP: // core option - can be changed on-the-fly
317 settings.setValue("fUseUPnP", value.toBool());
318- MapPort(value.toBool());
319+ if (value.toBool()) {
320+ StartMapPort();
321+ } else {
322+ StopMapPort();
Probably call InterruptMapPort here too, before Stop, for consistency.
Edit: Oh, you have Stop call Interrupt? That’s different from other [Start|Stop|Interrupt] constructions. As you probably know, the idea behind having a seperate interrupt is to have a two-stage (parallel) shutdown process, in which the interrupt can ask the subsystem to shut down, then Stop waits for it to really have stopped. Calling Stop without Interrupt could generally cause it to wait forever.
Updated for @laanwj’s suggestion, though I didn’t see the second comment until I’d already pushed.
Diff from before is trivial:
0diff --git a/src/net.cpp b/src/net.cpp
1index cd9a5e1..2019146 100644
2--- a/src/net.cpp
3+++ b/src/net.cpp
4@@ -1562,3 +1562,2 @@ void StopMapPort()
5 if(g_upnp_thread.joinable()) {
6- InterruptMapPort();
7 g_upnp_thread.join();
8diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
9index ee8ba65..909be1c 100644
10--- a/src/qt/optionsmodel.cpp
11+++ b/src/qt/optionsmodel.cpp
12@@ -320,2 +320,3 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
13 } else {
14+ InterruptMapPort();
15 StopMapPort();
1546+void StartMapPort()
1547 {
1548- static std::unique_ptr<boost::thread> upnp_thread;
1549+ if (!g_upnp_thread.joinable()) {
1550+ assert(!g_upnp_interrupt);
1551+ g_upnp_thread = std::thread((std::bind(&TraceThread<void (*)()>, "upnp", &ThreadMapPort)));
1576+ g_upnp_thread.join();
1577+ g_upnp_interrupt.reset();
1578 }
1579 }
1580
1581 #else
