ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

corrects an infinite loop when the acceptor is closed in thread pool mode references #168

Browse Source
This commit is contained in:
Peter Thorson
2012-12-19 06:26:28 -06:00
parent 6aa11a7fac
commit 6a1dccc8cb
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/roles/server.hpp
View File

@@ -309,14 +309,14 @@ void server<endpoint>::start_listen(const boost::asio::ip::tcp::endpoint& e,size
template <class endpoint>
void server<endpoint>::stop_listen(bool join) {
{
boost::unique_lock<boost::recursive_mutex> lock(m_endpoint.m_lock);
if (m_state != LISTENING) {
throw exception("stop_listen called from invalid state");
}
m_acceptor.close();
}
boost::unique_lock<boost::recursive_mutex> lock(m_endpoint.m_lock);
if (m_state != LISTENING) {
throw exception("stop_listen called from invalid state");
}
m_acceptor.close();
}
m_state = STOPPING;
@@ -353,6 +353,13 @@ template <class endpoint>
void server<endpoint>::start_accept() {
boost::lock_guard<boost::recursive_mutex> lock(m_endpoint.m_lock);
if (!m_acceptor.is_open()) {
m_endpoint.m_alog->at(log::alevel::ENDPOINT)
<< "Accept loop is stopping because acceptor was closed."
<< log::endl;
return;
}
connection_ptr con = m_endpoint.create_connection();
if (con == connection_ptr()) {
@@ -362,7 +369,7 @@ void server<endpoint>::start_accept() {
<< log::endl;
return;
}
m_acceptor.async_accept(
con->get_raw_socket(),
boost::bind(