Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Experiment with Boost.Beast to use version of async_accept accepting IO ctx 

This would make more sense instead of using the (copy of the) same socket
object all the time.
This commit is contained in:
Martchus 2021-01-26 19:32:42 +01:00
parent 6b274ccc88
commit 0c8f0b04c2
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
librepomgr/webapi/server.cpp
View File

@ -47,7 +47,6 @@ const Router Server::s_router = {
Server::Server(ServiceSetup &setup) Server::Server(ServiceSetup &setup)
: m_acceptor(setup.webServer.ioContext) : m_acceptor(setup.webServer.ioContext)
, m_socket(setup.webServer.ioContext)
, m_setup(setup) , m_setup(setup)
{ {
// open the acceptor // open the acceptor
@ -89,13 +88,10 @@ void Server::stop()
if (!s_instance) { if (!s_instance) {
return; return;
} }
boost::asio::post(s_instance->m_socket.get_executor(), [] { boost::asio::post(s_instance->m_setup.webServer.ioContext.get_executor(), [] {
if (!s_instance) { if (!s_instance) {
return; return;
} }
if (s_instance->m_socket.is_open()) {
s_instance->m_socket.cancel();
}
if (s_instance->m_acceptor.is_open()) { if (s_instance->m_acceptor.is_open()) {
s_instance->m_acceptor.cancel(); s_instance->m_acceptor.cancel();
} }
@ -113,17 +109,18 @@ void Server::run()
void Server::accept() void Server::accept()
{ {
m_acceptor.async_accept(m_socket, bind(&Server::handleAccepted, shared_from_this(), placeholders::_1)); m_acceptor.async_accept(
boost::asio::make_strand(m_setup.webServer.ioContext), boost::beast::bind_front_handler(&Server::handleAccepted, shared_from_this()));
} }
void Server::handleAccepted(boost::system::error_code ec) void Server::handleAccepted(boost::system::error_code ec, boost::asio::ip::tcp::socket socket)
{ {
if (ec) { if (ec) {
cerr << argsToString( cerr << argsToString(
formattedPhraseString(Phrases::WarningMessage), "Failed to accept new connection: ", ec.message(), formattedPhraseString(Phrases::End)); formattedPhraseString(Phrases::WarningMessage), "Failed to accept new connection: ", ec.message(), formattedPhraseString(Phrases::End));
} else { } else {
// create session and run it // create session and run it
std::make_shared<Session>(move(m_socket), m_setup)->receive(); std::make_shared<Session>(std::move(socket), m_setup)->receive();
} }
// accept next connection // accept next connection
accept(); accept();

3
librepomgr/webapi/server.h
View File

@ -33,11 +33,10 @@ public:
void run(); void run();
void accept(); void accept();
void handleAccepted(boost::system::error_code ec); void handleAccepted(boost::system::error_code ec, boost::asio::ip::tcp::socket);
private: private:
boost::asio::ip::tcp::acceptor m_acceptor; boost::asio::ip::tcp::acceptor m_acceptor;
boost::asio::ip::tcp::socket m_socket;
ServiceSetup &m_setup; ServiceSetup &m_setup;
static std::shared_ptr<Server> s_instance; static std::shared_ptr<Server> s_instance;
static const Router s_router; static const Router s_router;