boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-29 20:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pass strand to async_accept

Browse Source
This commit is contained in:
Vinnie Falco
2019-02-20 07:07:01 -08:00
parent fd4b080a4a
commit c3c3777661
12 changed files with 41 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
example/advanced/server-flex/advanced_server_flex.cpp
View File

@ -861,7 +861,6 @@ class listener : public std::enable_shared_from_this<listener>
net::io_context& ioc_;
ssl::context& ctx_;
tcp::acceptor acceptor_;
tcp::socket socket_;
std::shared_ptr<std::string const> doc_root_;
public:
@ -873,7 +872,6 @@ public:
: ioc_(ioc)
, ctx_(ctx)
, acceptor_(beast::make_strand(ioc))
, socket_(beast::make_strand(ioc))
, doc_root_(doc_root)
{
beast::error_code ec;
@ -924,15 +922,16 @@ public:
void
do_accept()
{
// The new connection gets its own strand
acceptor_.async_accept(
socket_,
beast::make_strand(ioc_),
beast::bind_front_handler(
&listener::on_accept,
shared_from_this()));
}
void
on_accept(beast::error_code ec)
on_accept(beast::error_code ec, tcp::socket socket)
{
if(ec)
{
@ -942,14 +941,11 @@ public:
{
// Create the detector http_session and run it
std::make_shared<detect_session>(
std::move(socket_),
std::move(socket),
ctx_,
doc_root_)->run();
}
// Make sure each session gets its own strand
socket_ = tcp::socket(beast::make_strand(ioc_));
// Accept another connection
do_accept();
}

12
example/advanced/server/advanced_server.cpp
View File

@ -526,7 +526,6 @@ class listener : public std::enable_shared_from_this<listener>
{
net::io_context& ioc_;
tcp::acceptor acceptor_;
tcp::socket socket_;
std::shared_ptr<std::string const> doc_root_;
public:
@ -536,7 +535,6 @@ public:
std::shared_ptr<std::string const> const& doc_root)
: ioc_(ioc)
, acceptor_(beast::make_strand(ioc))
, socket_(beast::make_strand(ioc))
, doc_root_(doc_root)
{
beast::error_code ec;
@ -587,15 +585,16 @@ public:
void
do_accept()
{
// The new connection gets its own strand
acceptor_.async_accept(
socket_,
beast::make_strand(ioc_),
beast::bind_front_handler(
&listener::on_accept,
shared_from_this()));
}
void
on_accept(beast::error_code ec)
on_accept(beast::error_code ec, tcp::socket socket)
{
if(ec)
{
@ -605,13 +604,10 @@ public:
{
// Create the http session and run it
std::make_shared<http_session>(
std::move(socket_),
std::move(socket),
doc_root_)->run();
}
// Make sure each session gets its own strand
socket_ = tcp::socket(beast::make_strand(ioc_));
// Accept another connection
do_accept();
}