Remove unused strands in server examples

This commit is contained in:
Peter Jankuliak
2017-09-22 11:05:20 +02:00
committed by Vinnie Falco
parent c81558e38b
commit fa4df7eb60
11 changed files with 8 additions and 26 deletions

View File

@ -1,6 +1,7 @@
Version 118: Version 118:
* file_win32 opens for read-only in shared mode * file_win32 opens for read-only in shared mode
* Remove unused strands in server examples
HTTP: HTTP:

View File

@ -1023,7 +1023,6 @@ public:
class listener : public std::enable_shared_from_this<listener> class listener : public std::enable_shared_from_this<listener>
{ {
ssl::context& ctx_; ssl::context& ctx_;
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
std::string const& doc_root_; std::string const& doc_root_;

View File

@ -593,7 +593,6 @@ public:
// Accepts incoming connections and launches the sessions // Accepts incoming connections and launches the sessions
class listener : public std::enable_shared_from_this<listener> class listener : public std::enable_shared_from_this<listener>
{ {
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
std::string const& doc_root_; std::string const& doc_root_;
@ -603,8 +602,7 @@ public:
boost::asio::io_service& ios, boost::asio::io_service& ios,
tcp::endpoint endpoint, tcp::endpoint endpoint,
std::string const& doc_root) std::string const& doc_root)
: strand_(ios) : acceptor_(ios)
, acceptor_(ios)
, socket_(ios) , socket_(ios)
, doc_root_(doc_root) , doc_root_(doc_root)
{ {

View File

@ -379,7 +379,6 @@ public:
class listener : public std::enable_shared_from_this<listener> class listener : public std::enable_shared_from_this<listener>
{ {
ssl::context& ctx_; ssl::context& ctx_;
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
std::string const& doc_root_; std::string const& doc_root_;
@ -391,7 +390,6 @@ public:
tcp::endpoint endpoint, tcp::endpoint endpoint,
std::string const& doc_root) std::string const& doc_root)
: ctx_(ctx) : ctx_(ctx)
, strand_(ios)
, acceptor_(ios) , acceptor_(ios)
, socket_(ios) , socket_(ios)
, doc_root_(doc_root) , doc_root_(doc_root)

View File

@ -346,7 +346,6 @@ public:
// Accepts incoming connections and launches the sessions // Accepts incoming connections and launches the sessions
class listener : public std::enable_shared_from_this<listener> class listener : public std::enable_shared_from_this<listener>
{ {
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
std::string const& doc_root_; std::string const& doc_root_;
@ -356,8 +355,7 @@ public:
boost::asio::io_service& ios, boost::asio::io_service& ios,
tcp::endpoint endpoint, tcp::endpoint endpoint,
std::string const& doc_root) std::string const& doc_root)
: strand_(ios) : acceptor_(ios)
, acceptor_(ios)
, socket_(ios) , socket_(ios)
, doc_root_(doc_root) , doc_root_(doc_root)
{ {

View File

@ -362,7 +362,6 @@ class listener
, public std::enable_shared_from_this<listener> , public std::enable_shared_from_this<listener>
{ {
ssl::context& ctx_; ssl::context& ctx_;
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
std::string const& doc_root_; std::string const& doc_root_;
@ -374,7 +373,6 @@ public:
tcp::endpoint endpoint, tcp::endpoint endpoint,
std::string const& doc_root) std::string const& doc_root)
: ctx_(ctx) : ctx_(ctx)
, strand_(ios)
, acceptor_(ios) , acceptor_(ios)
, socket_(ios) , socket_(ios)
, doc_root_(doc_root) , doc_root_(doc_root)

View File

@ -337,7 +337,6 @@ class listener
: public boost::asio::coroutine : public boost::asio::coroutine
, public std::enable_shared_from_this<listener> , public std::enable_shared_from_this<listener>
{ {
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
std::string const& doc_root_; std::string const& doc_root_;
@ -347,8 +346,7 @@ public:
boost::asio::io_service& ios, boost::asio::io_service& ios,
tcp::endpoint endpoint, tcp::endpoint endpoint,
std::string const& doc_root) std::string const& doc_root)
: strand_(ios) : acceptor_(ios)
, acceptor_(ios)
, socket_(ios) , socket_(ios)
, doc_root_(doc_root) , doc_root_(doc_root)
{ {

View File

@ -159,7 +159,6 @@ public:
class listener : public std::enable_shared_from_this<listener> class listener : public std::enable_shared_from_this<listener>
{ {
ssl::context& ctx_; ssl::context& ctx_;
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
@ -169,7 +168,6 @@ public:
ssl::context& ctx, ssl::context& ctx,
tcp::endpoint endpoint) tcp::endpoint endpoint)
: ctx_(ctx) : ctx_(ctx)
, strand_(ios)
, acceptor_(ios) , acceptor_(ios)
, socket_(ios) , socket_(ios)
{ {

View File

@ -137,7 +137,6 @@ public:
// Accepts incoming connections and launches the sessions // Accepts incoming connections and launches the sessions
class listener : public std::enable_shared_from_this<listener> class listener : public std::enable_shared_from_this<listener>
{ {
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
@ -145,8 +144,7 @@ public:
listener( listener(
boost::asio::io_service& ios, boost::asio::io_service& ios,
tcp::endpoint endpoint) tcp::endpoint endpoint)
: strand_(ios) : acceptor_(ios)
, acceptor_(ios)
, socket_(ios) , socket_(ios)
{ {
boost::system::error_code ec; boost::system::error_code ec;
@ -191,10 +189,10 @@ public:
{ {
acceptor_.async_accept( acceptor_.async_accept(
socket_, socket_,
strand_.wrap(std::bind( std::bind(
&listener::on_accept, &listener::on_accept,
shared_from_this(), shared_from_this(),
std::placeholders::_1))); std::placeholders::_1));
} }
void void

View File

@ -147,7 +147,6 @@ class listener
, public std::enable_shared_from_this<listener> , public std::enable_shared_from_this<listener>
{ {
ssl::context& ctx_; ssl::context& ctx_;
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
@ -157,7 +156,6 @@ public:
ssl::context& ctx, ssl::context& ctx,
tcp::endpoint endpoint) tcp::endpoint endpoint)
: ctx_(ctx) : ctx_(ctx)
, strand_(ios)
, acceptor_(ios) , acceptor_(ios)
, socket_(ios) , socket_(ios)
{ {

View File

@ -128,7 +128,6 @@ class listener
: public boost::asio::coroutine : public boost::asio::coroutine
, public std::enable_shared_from_this<listener> , public std::enable_shared_from_this<listener>
{ {
boost::asio::io_service::strand strand_;
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
tcp::socket socket_; tcp::socket socket_;
@ -136,8 +135,7 @@ public:
listener( listener(
boost::asio::io_service& ios, boost::asio::io_service& ios,
tcp::endpoint endpoint) tcp::endpoint endpoint)
: strand_(ios) : acceptor_(ios)
, acceptor_(ios)
, socket_(ios) , socket_(ios)
{ {
boost::system::error_code ec; boost::system::error_code ec;