nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

p2p: stop net server before closing starting connections

Browse Source 
This fixes a hang on exit due to race where a connection adds
itself to the server after the starting connections are closed,
but before the net server marks itself as stopped.
This commit is contained in:
moneromooo-monero 2017-12-15 10:28:15 +00:00
parent f51bac990e
commit d28c388f88
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/p2p/net_node.inl
View File

@ -686,6 +686,10 @@ namespace nodetool
template<class t_payload_net_handler> template<class t_payload_net_handler>
bool node_server<t_payload_net_handler>::send_stop_signal() bool node_server<t_payload_net_handler>::send_stop_signal()
{ {
MDEBUG("[node] sending stop signal");
m_net_server.send_stop_signal();
MDEBUG("[node] Stop signal sent");
std::list<boost::uuids::uuid> connection_ids; std::list<boost::uuids::uuid> connection_ids;
m_net_server.get_config_object().foreach_connection([&](const p2p_connection_context& cntxt) { m_net_server.get_config_object().foreach_connection([&](const p2p_connection_context& cntxt) {
connection_ids.push_back(cntxt.m_connection_id); connection_ids.push_back(cntxt.m_connection_id);
@ -695,8 +699,7 @@ namespace nodetool
m_net_server.get_config_object().close(connection_id); m_net_server.get_config_object().close(connection_id);
m_payload_handler.stop(); m_payload_handler.stop();
m_net_server.send_stop_signal();
MDEBUG("[node] Stop signal sent");
return true; return true;
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------