0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a serious bug involving a hang-up in a wesnoth client...

Browse source 
...after an abrupt server disconnection. The network component was
deleted in the handler of the disconnection event which led to the
destructor trying to wait for the handler execution thread to finish
thus producing a deadlock.
This commit is contained in:
Guillermo Biset 2010-08-25 03:54:10 +00:00
parent 09744cbaca
commit e81434b56e
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/network_manager_ana.cpp
View file

@ -585,6 +585,7 @@ ana_network_manager::ana_network_manager() :
connect_timer_( NULL ),
components_(),
server_manager_(),
disconnected_components_(),
disconnected_ids_()
{
}
@ -756,9 +757,21 @@ void ana_network_manager::close_connections_and_cleanup()
void ana_network_manager::throw_if_pending_disconnection()
{
if ( ! disconnected_components_.empty() )
{
ana_component* component = disconnected_components_.front();
disconnected_components_.pop();
const ana::net_id id = component->get_id(); // Should I use wesnoth_id here?
delete component;
throw network::error(_("Client disconnected"),id);
}
if ( ! disconnected_ids_.empty() )
{
const ana::net_id id = disconnected_ids_.front();
ana::net_id id = disconnected_ids_.front();
disconnected_ids_.pop();
throw network::error(_("Client disconnected"),id);
}
@ -1305,10 +1318,8 @@ void ana_network_manager::handle_disconnect(ana::error_code /*error_code*/, ana:
if ( it != components_.end() )
{
// close_connections_and_cleanup();
delete *it;
disconnected_components_.push( *it );
components_.erase(it);
disconnected_ids_.push( client );
}
else
{

6
src/network_manager_ana.hpp
View file

@ -517,7 +517,11 @@ class ana_network_manager : public ana::listener_handler,
std::map< ana::server*, clients_manager* > server_manager_;
std::queue< ana::net_id > disconnected_ids_;
/** Clients that have disconnected from servers (used for client applications.) */
std::queue< ana_component* > disconnected_components_;
/** Client IDs that have disconnected from a serve (used in servers applications.) */
std::queue< ana::net_id > disconnected_ids_;
};
#endif