Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Rebased "Fix iteration logic in _handle_message_calls_in_progress shutdown loop to handle concurrent modification #598" to fix revert #637

Browse source
This commit is contained in:
theoreticalbts 2016-03-25 01:43:46 -04:00
parent 7ce088471a
commit c777a88649
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/net/node.cpp
View file

@ -3952,12 +3952,20 @@ namespace graphene { namespace net { namespace detail {
} }
unsigned handle_message_call_count = 0; unsigned handle_message_call_count = 0;
for (fc::future<void>& handle_message_call : _handle_message_calls_in_progress) while( true )
{ {
auto it = _handle_message_calls_in_progress.begin();
if( it == _handle_message_calls_in_progress.end() )
break;
if( it->ready() || it->error() || it->canceled() )
{
_handle_message_calls_in_progress.erase( it );
continue;
}
++handle_message_call_count; ++handle_message_call_count;
try try
{ {
handle_message_call.cancel_and_wait("node_impl::close()"); it->cancel_and_wait("node_impl::close()");
dlog("handle_message call #${count} task terminated", ("count", handle_message_call_count)); dlog("handle_message call #${count} task terminated", ("count", handle_message_call_count));
} }
catch ( const fc::canceled_exception& ) catch ( const fc::canceled_exception& )
@ -3973,7 +3981,6 @@ namespace graphene { namespace net { namespace detail {
wlog("Exception thrown while terminating handle_message call #${count} task, ignoring",("count", handle_message_call_count)); wlog("Exception thrown while terminating handle_message call #${count} task, ignoring",("count", handle_message_call_count));
} }
} }
_handle_message_calls_in_progress.clear();
try try
{ {