From fa4df7eb604fb176b5385c8eb28314fcba54cfa0 Mon Sep 17 00:00:00 2001 From: Peter Jankuliak Date: Fri, 22 Sep 2017 11:05:20 +0200 Subject: [PATCH] Remove unused strands in server examples --- CHANGELOG.md | 1 + example/advanced/server-flex/advanced_server_flex.cpp | 1 - example/advanced/server/advanced_server.cpp | 4 +--- example/http/server/async-ssl/http_server_async_ssl.cpp | 2 -- example/http/server/async/http_server_async.cpp | 4 +--- .../server/stackless-ssl/http_server_stackless_ssl.cpp | 2 -- example/http/server/stackless/http_server_stackless.cpp | 4 +--- .../server/async-ssl/websocket_server_async_ssl.cpp | 2 -- example/websocket/server/async/websocket_server_async.cpp | 8 +++----- .../stackless-ssl/websocket_server_stackless_ssl.cpp | 2 -- .../server/stackless/websocket_server_stackless.cpp | 4 +--- 11 files changed, 8 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcd3ed9c..7cb4c483 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Version 118: * file_win32 opens for read-only in shared mode +* Remove unused strands in server examples HTTP: diff --git a/example/advanced/server-flex/advanced_server_flex.cpp b/example/advanced/server-flex/advanced_server_flex.cpp index 372b1fb2..0880810f 100644 --- a/example/advanced/server-flex/advanced_server_flex.cpp +++ b/example/advanced/server-flex/advanced_server_flex.cpp @@ -1023,7 +1023,6 @@ public: class listener : public std::enable_shared_from_this { ssl::context& ctx_; - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; std::string const& doc_root_; diff --git a/example/advanced/server/advanced_server.cpp b/example/advanced/server/advanced_server.cpp index caf17410..c8d5b78e 100644 --- a/example/advanced/server/advanced_server.cpp +++ b/example/advanced/server/advanced_server.cpp @@ -593,7 +593,6 @@ public: // Accepts incoming connections and launches the sessions class listener : public std::enable_shared_from_this { - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; std::string const& doc_root_; @@ -603,8 +602,7 @@ public: boost::asio::io_service& ios, tcp::endpoint endpoint, std::string const& doc_root) - : strand_(ios) - , acceptor_(ios) + : acceptor_(ios) , socket_(ios) , doc_root_(doc_root) { diff --git a/example/http/server/async-ssl/http_server_async_ssl.cpp b/example/http/server/async-ssl/http_server_async_ssl.cpp index c9d23a36..cbdefb79 100644 --- a/example/http/server/async-ssl/http_server_async_ssl.cpp +++ b/example/http/server/async-ssl/http_server_async_ssl.cpp @@ -379,7 +379,6 @@ public: class listener : public std::enable_shared_from_this { ssl::context& ctx_; - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; std::string const& doc_root_; @@ -391,7 +390,6 @@ public: tcp::endpoint endpoint, std::string const& doc_root) : ctx_(ctx) - , strand_(ios) , acceptor_(ios) , socket_(ios) , doc_root_(doc_root) diff --git a/example/http/server/async/http_server_async.cpp b/example/http/server/async/http_server_async.cpp index 3f9d0c33..d7593683 100644 --- a/example/http/server/async/http_server_async.cpp +++ b/example/http/server/async/http_server_async.cpp @@ -346,7 +346,6 @@ public: // Accepts incoming connections and launches the sessions class listener : public std::enable_shared_from_this { - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; std::string const& doc_root_; @@ -356,8 +355,7 @@ public: boost::asio::io_service& ios, tcp::endpoint endpoint, std::string const& doc_root) - : strand_(ios) - , acceptor_(ios) + : acceptor_(ios) , socket_(ios) , doc_root_(doc_root) { diff --git a/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp b/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp index 9f34b57e..c27d953e 100644 --- a/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp +++ b/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp @@ -362,7 +362,6 @@ class listener , public std::enable_shared_from_this { ssl::context& ctx_; - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; std::string const& doc_root_; @@ -374,7 +373,6 @@ public: tcp::endpoint endpoint, std::string const& doc_root) : ctx_(ctx) - , strand_(ios) , acceptor_(ios) , socket_(ios) , doc_root_(doc_root) diff --git a/example/http/server/stackless/http_server_stackless.cpp b/example/http/server/stackless/http_server_stackless.cpp index 2535632e..673d190b 100644 --- a/example/http/server/stackless/http_server_stackless.cpp +++ b/example/http/server/stackless/http_server_stackless.cpp @@ -337,7 +337,6 @@ class listener : public boost::asio::coroutine , public std::enable_shared_from_this { - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; std::string const& doc_root_; @@ -347,8 +346,7 @@ public: boost::asio::io_service& ios, tcp::endpoint endpoint, std::string const& doc_root) - : strand_(ios) - , acceptor_(ios) + : acceptor_(ios) , socket_(ios) , doc_root_(doc_root) { diff --git a/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp b/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp index e4075979..a3469d56 100644 --- a/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp +++ b/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp @@ -159,7 +159,6 @@ public: class listener : public std::enable_shared_from_this { ssl::context& ctx_; - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; @@ -169,7 +168,6 @@ public: ssl::context& ctx, tcp::endpoint endpoint) : ctx_(ctx) - , strand_(ios) , acceptor_(ios) , socket_(ios) { diff --git a/example/websocket/server/async/websocket_server_async.cpp b/example/websocket/server/async/websocket_server_async.cpp index 716eea42..ae87fea5 100644 --- a/example/websocket/server/async/websocket_server_async.cpp +++ b/example/websocket/server/async/websocket_server_async.cpp @@ -137,7 +137,6 @@ public: // Accepts incoming connections and launches the sessions class listener : public std::enable_shared_from_this { - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; @@ -145,8 +144,7 @@ public: listener( boost::asio::io_service& ios, tcp::endpoint endpoint) - : strand_(ios) - , acceptor_(ios) + : acceptor_(ios) , socket_(ios) { boost::system::error_code ec; @@ -191,10 +189,10 @@ public: { acceptor_.async_accept( socket_, - strand_.wrap(std::bind( + std::bind( &listener::on_accept, shared_from_this(), - std::placeholders::_1))); + std::placeholders::_1)); } void diff --git a/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp b/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp index 165019c5..7c94f59b 100644 --- a/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp +++ b/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp @@ -147,7 +147,6 @@ class listener , public std::enable_shared_from_this { ssl::context& ctx_; - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; @@ -157,7 +156,6 @@ public: ssl::context& ctx, tcp::endpoint endpoint) : ctx_(ctx) - , strand_(ios) , acceptor_(ios) , socket_(ios) { diff --git a/example/websocket/server/stackless/websocket_server_stackless.cpp b/example/websocket/server/stackless/websocket_server_stackless.cpp index 79149387..d76949ad 100644 --- a/example/websocket/server/stackless/websocket_server_stackless.cpp +++ b/example/websocket/server/stackless/websocket_server_stackless.cpp @@ -128,7 +128,6 @@ class listener : public boost::asio::coroutine , public std::enable_shared_from_this { - boost::asio::io_service::strand strand_; tcp::acceptor acceptor_; tcp::socket socket_; @@ -136,8 +135,7 @@ public: listener( boost::asio::io_service& ios, tcp::endpoint endpoint) - : strand_(ios) - , acceptor_(ios) + : acceptor_(ios) , socket_(ios) { boost::system::error_code ec;