Auto merge of #3647 - LarryRuane:2926-mutex-assert-stop, r=str4d
On shutdown, wait for miner threads to exit (join them) Closes #2926. Have `Shutdown()` running in the main thread wait for miner threads to exit before exiting.
This commit is contained in:
commit
8df7a073ce
|
@ -640,10 +640,11 @@ void static BitcoinMiner()
|
|||
LogPrintf("ZcashMiner:\n");
|
||||
LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", pblock->GetHash().GetHex(), hashTarget.GetHex());
|
||||
#ifdef ENABLE_WALLET
|
||||
if (ProcessBlockFound(pblock, *pwallet, reservekey)) {
|
||||
if (ProcessBlockFound(pblock, *pwallet, reservekey))
|
||||
#else
|
||||
if (ProcessBlockFound(pblock)) {
|
||||
if (ProcessBlockFound(pblock))
|
||||
#endif
|
||||
{
|
||||
// Ignore chain updates caused by us
|
||||
std::lock_guard<std::mutex> lock{m_cs};
|
||||
cancelSolver = false;
|
||||
|
@ -767,6 +768,7 @@ void GenerateBitcoins(bool fGenerate, int nThreads)
|
|||
if (minerThreads != NULL)
|
||||
{
|
||||
minerThreads->interrupt_all();
|
||||
minerThreads->join_all();
|
||||
delete minerThreads;
|
||||
minerThreads = NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue