highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-24 07:51:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

shutdown: Stop threads before resetting ptrs

Browse Source
This commit is contained in:
MarcoFalke 2018-08-06 12:08:35 -04:00
parent 1ef57a96b8
commit faab63111d
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/init.cpp
View File

@ -209,11 +209,7 @@ void Shutdown()
// using the other before destroying them. // using the other before destroying them.
if (peerLogic) UnregisterValidationInterface(peerLogic.get()); if (peerLogic) UnregisterValidationInterface(peerLogic.get());
if (g_connman) g_connman->Stop(); if (g_connman) g_connman->Stop();
peerLogic.reset(); if (g_txindex) g_txindex->Stop();
g_connman.reset();
if (g_txindex) {
g_txindex.reset();
}
StopTorControl(); StopTorControl();
@ -222,6 +218,12 @@ void Shutdown()
threadGroup.interrupt_all(); threadGroup.interrupt_all();
threadGroup.join_all(); threadGroup.join_all();
// After the threads that potentially access these pointers have been stopped,
// destruct and reset all to nullptr.
peerLogic.reset();
g_connman.reset();
g_txindex.reset();
if (g_is_mempool_loaded && gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { if (g_is_mempool_loaded && gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
DumpMempool(); DumpMempool();
} }