rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 11:23:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

async_protocol_handler_config: fix deadlock

Browse Source
This commit is contained in:
anon 2021-03-12 11:59:06 +00:00
parent c877705a53
commit 2935a0c479
No known key found for this signature in database
GPG Key ID: D3857C17AA7F968B
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
contrib/epee/include/net/levin_protocol_handler_async.h
View File

@ -769,36 +769,32 @@ void async_protocol_handler_config<t_connection_context>::del_connection(async_p
template<class t_connection_context> template<class t_connection_context>
void async_protocol_handler_config<t_connection_context>::delete_connections(size_t count, bool incoming) void async_protocol_handler_config<t_connection_context>::delete_connections(size_t count, bool incoming)
{ {
std::vector <boost::uuids::uuid> connections; std::vector<typename connections_map::mapped_type> connections;
auto scope_exit_handler = misc_utils::create_scope_leave_handler([&connections]{
for (auto &aph: connections)
aph->finish_outer_call();
});
CRITICAL_REGION_BEGIN(m_connects_lock); CRITICAL_REGION_BEGIN(m_connects_lock);
for (auto& c: m_connects) for (auto& c: m_connects)
{ {
if (c.second->m_connection_context.m_is_income == incoming) if (c.second->m_connection_context.m_is_income == incoming)
connections.push_back(c.first); if (c.second->start_outer_call())
connections.push_back(c.second);
} }
// close random connections from the provided set // close random connections from the provided set
// TODO or better just keep removing random elements (performance) // TODO or better just keep removing random elements (performance)
unsigned seed = std::chrono::system_clock::now().time_since_epoch().count(); unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
shuffle(connections.begin(), connections.end(), std::default_random_engine(seed)); shuffle(connections.begin(), connections.end(), std::default_random_engine(seed));
while (count > 0 && connections.size() > 0) for (size_t i = 0; i < connections.size() && i < count; ++i)
{ m_connects.erase(connections[i]->get_connection_id());
try
{
auto i = connections.end() - 1;
async_protocol_handler<t_connection_context> *conn = m_connects.at(*i);
m_connects.erase(*i);
conn->close();
connections.erase(i);
}
catch (const std::out_of_range &e)
{
MWARNING("Connection not found in m_connects, continuing");
}
--count;
}
CRITICAL_REGION_END(); CRITICAL_REGION_END();
for (size_t i = 0; i < connections.size() && i < count; ++i)
connections[i]->close();
} }
//------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------
template<class t_connection_context> template<class t_connection_context>
@ -860,18 +856,19 @@ int async_protocol_handler_config<t_connection_context>::invoke_async(int comman
template<class t_connection_context> template<class callback_t> template<class t_connection_context> template<class callback_t>
bool async_protocol_handler_config<t_connection_context>::foreach_connection(const callback_t &cb) bool async_protocol_handler_config<t_connection_context>::foreach_connection(const callback_t &cb)
{ {
CRITICAL_REGION_LOCAL(m_connects_lock);
std::vector<typename connections_map::mapped_type> conn; std::vector<typename connections_map::mapped_type> conn;
conn.reserve(m_connects.size());
auto scope_exit_handler = misc_utils::create_scope_leave_handler([&conn]{ auto scope_exit_handler = misc_utils::create_scope_leave_handler([&conn]{
for (auto &aph: conn) for (auto &aph: conn)
aph->finish_outer_call(); aph->finish_outer_call();
}); });
CRITICAL_REGION_BEGIN(m_connects_lock);
conn.reserve(m_connects.size());
for (auto &e: m_connects) for (auto &e: m_connects)
if (e.second->start_outer_call()) if (e.second->start_outer_call())
conn.push_back(e.second); conn.push_back(e.second);
CRITICAL_REGION_END()
for (auto &aph: conn) for (auto &aph: conn)
if (!cb(aph->get_context_ref())) if (!cb(aph->get_context_ref()))
@ -883,11 +880,8 @@ bool async_protocol_handler_config<t_connection_context>::foreach_connection(con
template<class t_connection_context> template<class callback_t> template<class t_connection_context> template<class callback_t>
bool async_protocol_handler_config<t_connection_context>::for_connection(const boost::uuids::uuid &connection_id, const callback_t &cb) bool async_protocol_handler_config<t_connection_context>::for_connection(const boost::uuids::uuid &connection_id, const callback_t &cb)
{ {
CRITICAL_REGION_LOCAL(m_connects_lock); async_protocol_handler<t_connection_context>* aph = nullptr;
async_protocol_handler<t_connection_context>* aph = find_connection(connection_id); if (find_and_lock_connection(connection_id, aph) != LEVIN_OK)
if (!aph)
return false;
if (!aph->start_outer_call())
return false; return false;
auto scope_exit_handler = misc_utils::create_scope_leave_handler( auto scope_exit_handler = misc_utils::create_scope_leave_handler(
boost::bind(&async_protocol_handler<t_connection_context>::finish_outer_call, aph)); boost::bind(&async_protocol_handler<t_connection_context>::finish_outer_call, aph));
@ -953,12 +947,14 @@ int async_protocol_handler_config<t_connection_context>::send(byte_slice message
template<class t_connection_context> template<class t_connection_context>
bool async_protocol_handler_config<t_connection_context>::close(boost::uuids::uuid connection_id) bool async_protocol_handler_config<t_connection_context>::close(boost::uuids::uuid connection_id)
{ {
CRITICAL_REGION_LOCAL(m_connects_lock); async_protocol_handler<t_connection_context>* aph = nullptr;
async_protocol_handler<t_connection_context>* aph = find_connection(connection_id); if (find_and_lock_connection(connection_id, aph) != LEVIN_OK)
if (!aph)
return false; return false;
auto scope_exit_handler = misc_utils::create_scope_leave_handler(
boost::bind(&async_protocol_handler<t_connection_context>::finish_outer_call, aph));
if (!aph->close()) if (!aph->close())
return false; return false;
CRITICAL_REGION_LOCAL(m_connects_lock);
m_connects.erase(connection_id); m_connects.erase(connection_id);
return true; return true;
} }