Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve socket error handling

Browse source
This commit is contained in:
Daniel Larimer 2014-06-30 10:50:50 -04:00
parent 160da5dbb9
commit 13da4b0d6a
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/network/udt_socket.cpp
View file

@ -77,6 +77,7 @@ namespace fc {
} // while not canceled } // while not canceled
} // poll_loop } // poll_loop
void notify_read( int udt_socket_id, void notify_read( int udt_socket_id,
const promise<void>::ptr& p ) const promise<void>::ptr& p )
{ {
@ -110,6 +111,22 @@ namespace fc {
} }
void remove( int udt_socket_id ) void remove( int udt_socket_id )
{ {
{ synchronized(_read_promises_mutex)
auto read_itr = _read_promises.find( udt_socket_id );
if( read_itr != _read_promises.end() )
{
read_itr->second->set_exception( fc::copy_exception( fc::canceled_exception() ) );
_read_promises.erase(read_itr);
}
}
{ synchronized(_write_promises_mutex)
auto write_itr = _write_promises.find( udt_socket_id );
if( write_itr != _write_promises.end() )
{
write_itr->second->set_exception( fc::copy_exception( fc::canceled_exception() ) );
_write_promises.erase(write_itr);
}
}
UDT::epoll_remove_usock( _epoll_id, udt_socket_id ); UDT::epoll_remove_usock( _epoll_id, udt_socket_id );
} }
@ -264,11 +281,14 @@ namespace fc {
if( is_open() ) if( is_open() )
{ {
default_epool_service().remove( _udt_socket_id ); default_epool_service().remove( _udt_socket_id );
UDT::close( _udt_socket_id ); UDT::close( _udt_socket_id );
check_udt_errors(); check_udt_errors();
_udt_socket_id = UDT::INVALID_SOCK; _udt_socket_id = UDT::INVALID_SOCK;
} }
else
{
wlog( "already closed" );
}
} FC_CAPTURE_AND_RETHROW() } } FC_CAPTURE_AND_RETHROW() }
/// @} /// @}
@ -317,9 +337,9 @@ namespace fc {
{ try { { try {
if( _udt_socket_id != UDT::INVALID_SOCK ) if( _udt_socket_id != UDT::INVALID_SOCK )
{ {
default_epool_service().remove( _udt_socket_id );
UDT::close( _udt_socket_id ); UDT::close( _udt_socket_id );
check_udt_errors(); check_udt_errors();
default_epool_service().remove( _udt_socket_id );
_udt_socket_id = UDT::INVALID_SOCK; _udt_socket_id = UDT::INVALID_SOCK;
} }
} FC_CAPTURE_AND_RETHROW() } } FC_CAPTURE_AND_RETHROW() }
@ -330,17 +350,17 @@ namespace fc {
int namelen; int namelen;
sockaddr_in their_addr; sockaddr_in their_addr;
s._udt_socket_id = UDT::accept( _udt_socket_id, (sockaddr*)&their_addr, &namelen );
if( s._udt_socket_id == UDT::INVALID_SOCK ) while( s._udt_socket_id == UDT::INVALID_SOCK )
{ {
s._udt_socket_id = UDT::accept( _udt_socket_id, (sockaddr*)&their_addr, &namelen );
if( UDT::getlasterror().getErrorCode() == CUDTException::EASYNCRCV ) if( UDT::getlasterror().getErrorCode() == CUDTException::EASYNCRCV )
{ {
UDT::getlasterror().clear(); UDT::getlasterror().clear();
promise<void>::ptr p(new promise<void>("udt_server::accept")); promise<void>::ptr p(new promise<void>("udt_server::accept"));
default_epool_service().notify_read( _udt_socket_id, p ); default_epool_service().notify_read( _udt_socket_id, p );
p->wait(); p->wait();
this->accept(s); s._udt_socket_id = UDT::accept( _udt_socket_id, (sockaddr*)&their_addr, &namelen );
} }
else else
check_udt_errors(); check_udt_errors();