ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix websocket deadlock:

Browse Source 
A copy of the connection list is made on stop so it
can be iterated without holding the endpoint lock.
This commit is contained in:
seelabs
2016-01-14 11:48:44 -05:00
committed by Nik Bougalis
parent 10a5421987
commit 07c4262392
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/websocketpp_02/src/endpoint.hpp
View File

@@ -334,18 +334,23 @@ public:
void close_all(close::status::value code = close::status::GOING_AWAY,
const std::string& reason = "")
{
boost::lock_guard<boost::recursive_mutex> lock(m_lock);
auto connections = [&, this]
{
boost::lock_guard<boost::recursive_mutex> lock (m_lock);
m_alog->at(log::alevel::ENDPOINT)
<< "Endpoint received signal to close all connections cleanly with code "
<< code << " and reason " << reason << log::endl;
m_alog->at (log::alevel::ENDPOINT)
<< "Endpoint received signal to close all connections cleanly "
"with code "
<< code << " and reason " << reason << log::endl;
return m_connections;
}();
// TODO: is there a more elegant way to do this? In some code paths
// close can call terminate immediately which removes the connection
// from m_connections, invalidating the iterator.
typename std::set<connection_ptr>::iterator it;
for (it = m_connections.begin(); it != m_connections.end();) {
for (it = connections.begin(); it != connections.end();) {
const connection_ptr con = *it++;
con->close(code,reason);
}
@@ -378,15 +383,18 @@ public:
close::status::value code = close::status::GOING_AWAY,
const std::string& reason = "")
{
boost::lock_guard<boost::recursive_mutex> lock(m_lock);
if (clean) {
m_alog->at(log::alevel::ENDPOINT)
<< "Endpoint is stopping cleanly" << log::endl;
{
boost::lock_guard<boost::recursive_mutex> lock(m_lock);
m_alog->at(log::alevel::ENDPOINT)
<< "Endpoint is stopping cleanly" << log::endl;
m_state = STOPPING;
m_state = STOPPING;
}
close_all(code,reason);
} else {
boost::lock_guard<boost::recursive_mutex> lock(m_lock);
m_alog->at(log::alevel::ENDPOINT)
<< "Endpoint is stopping immediately" << log::endl;