monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 20:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #736

Browse source 
2b4cab3 epee: fix potential hang on exit (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-03-20 21:28:11 +02:00
commit f6317ec1c0
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/epee/include/net/abstract_tcp_server2.inl
View file

@ -1005,6 +1005,12 @@ POP_WARNINGS
while(local_shared_context->ec == boost::asio::error::would_block) while(local_shared_context->ec == boost::asio::error::would_block)
{ {
bool r = local_shared_context->cond.timed_wait(lock, boost::get_system_time() + boost::posix_time::milliseconds(conn_timeout)); bool r = local_shared_context->cond.timed_wait(lock, boost::get_system_time() + boost::posix_time::milliseconds(conn_timeout));
if (m_stop_signal_sent)
{
if (sock_.is_open())
sock_.close();
return false;
}
if(local_shared_context->ec == boost::asio::error::would_block && !r) if(local_shared_context->ec == boost::asio::error::would_block && !r)
{ {
//timeout //timeout
@ -1018,6 +1024,8 @@ POP_WARNINGS
if (ec || !sock_.is_open()) if (ec || !sock_.is_open())
{ {
_dbg3("Some problems at connect, message: " << ec.message()); _dbg3("Some problems at connect, message: " << ec.message());
if (sock_.is_open())
sock_.close();
return false; return false;
} }