fixed deadlock on resume

libethereum/BlockChainSync.cpp

@@ -364,7 +364,6 @@ void PV60Sync::transition(EthereumPeer* _peer, SyncState _s, bool _force, bool _
 {
 	clog(NetMessageSummary) << "Transition!" << EthereumHost::stateName(_s) << "from" << EthereumHost::stateName(m_state) << ", " << (isSyncing(_peer) ? "syncing" : "holding") << (needsSyncing(_peer) ? "& needed" : "");
 
-	//DEV_INVARIANT_CHECK;
 	if (m_state == SyncState::Idle && _s != SyncState::Idle)
 		_peer->m_requireTransactions = true;
 

libethereum/BlockQueue.cpp

@@ -37,7 +37,7 @@ const char* BlockQueueChannel::name() { return EthOrange "[]>"; }
 const char* BlockQueueChannel::name() { return EthOrange "▣┅▶"; }
 #endif
 
-size_t const c_maxKnownCount = 100000;
+size_t const c_maxKnownCount = 10000;
 size_t const c_maxKnownSize = 128 * 1024 * 1024;
 size_t const c_maxUnknownCount = 100000;
 size_t const c_maxUnknownSize = 512 * 1024 * 1024; // Block size can be ~50kb
@@ -196,6 +196,7 @@ ImportResult BlockQueue::import(bytesConstRef _block, BlockChain const& _bc, boo
 
 	// VERIFY: populates from the block and checks the block is internally coherent.
 	BlockInfo bi;
+
 	try
 	{
 		// TODO: quick verify
@@ -435,12 +436,13 @@ bool BlockQueue::unknownFull() const
 
 void BlockQueue::drain(VerifiedBlocks& o_out, unsigned _max)
 {
-	WriteGuard l(m_lock);
+	bool wasFull = false;
+	DEV_WRITE_GUARDED(m_lock)
+	{
 		DEV_INVARIANT_CHECK;
-
+		wasFull = knownFull();
 		if (m_drainingSet.empty())
 		{
-		bool wasFull = knownFull();
 			m_drainingDifficulty = 0;
 			DEV_GUARDED(m_verification)
 			{
@@ -459,12 +461,12 @@ void BlockQueue::drain(VerifiedBlocks& o_out, unsigned _max)
 				m_knownSize -= bs.verified.block.size();
 				m_knownCount--;
 			}
+		}
+	}
 	if (wasFull && !knownFull())
 		m_onRoomAvailable();
 }
 
-}
-
 bool BlockQueue::invariants() const
 {
 	Guard l(m_verification);