Merge pull request #3229

928c1825 cryptonote_protocol: guard against all threads in standby (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-02-16 14:23:53 +01:00
commit ef47ba95c8
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -1333,6 +1333,15 @@ skip:
break; break;
} }
// this one triggers if all threads are in standby, which should not happen,
// but happened at least once, so we unblock at least one thread if so
const boost::unique_lock<boost::mutex> sync{m_sync_lock, boost::try_to_lock};
if (sync.owns_lock())
{
LOG_DEBUG_CC(context, "No other thread is adding blocks, resuming");
break;
}
if (should_download_next_span(context)) if (should_download_next_span(context))
{ {
MDEBUG(context << " we should try for that next span too, we think we could get it faster, resuming"); MDEBUG(context << " we should try for that next span too, we think we could get it faster, resuming");