Update for Net-TS Asio (API Change):

fix #769

The following classes are removed:

* handler_type
* async_result
* async_completion
* is_dynamic_buffer
* is_const_buffer_sequence
* is_mutable_buffer_sequence
* handler_alloc

Actions Required:

* Use BOOST_ASIO_HANDLER_TYPE instead of handler_type
* Use BOOST_ASIO_INITFN_RESULT_TYPE instead of async_result
* Use boost::asio::async_completion
* Use boost::asio::is_dynamic_buffer
* Use boost::asio::is_const_buffer_sequence
* Use boost::asio::is_mutable_buffer_sequence
* boost::asio::associated_allocator_t replaces handler_alloc

example/http/server/async-ssl/http_server_async_ssl.cpp

@@ -18,6 +18,7 @@
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
 #include <boost/beast/version.hpp>
+#include <boost/asio/bind_executor.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <boost/asio/strand.hpp>
@@ -244,18 +245,21 @@ class session : public std::enable_shared_from_this<session>
             http::async_write(
                 self_.stream_,
                 *sp,
-                self_.strand_.wrap(std::bind(
-                    &session::on_write,
-                    self_.shared_from_this(),
-                    std::placeholders::_1,
-                    std::placeholders::_2,
-                    ! sp->keep_alive())));
+                boost::asio::bind_executor(
+                    self_.strand_,
+                    std::bind(
+                        &session::on_write,
+                        self_.shared_from_this(),
+                        std::placeholders::_1,
+                        std::placeholders::_2,
+                        ! sp->keep_alive())));
         }
     };
 
     tcp::socket socket_;
     ssl::stream<tcp::socket&> stream_;
-    boost::asio::io_service::strand strand_;
+    boost::asio::strand<
+        boost::asio::io_context::executor_type> strand_;
     boost::beast::flat_buffer buffer_;
     std::string const& doc_root_;
     http::request<http::string_body> req_;
@@ -271,7 +275,7 @@ public:
         std::string const& doc_root)
         : socket_(std::move(socket))
         , stream_(socket_, ctx)
-        , strand_(socket_.get_io_service())
+        , strand_(socket_.get_executor())
         , doc_root_(doc_root)
         , lambda_(*this)
     {
@@ -284,10 +288,12 @@ public:
         // Perform the SSL handshake
         stream_.async_handshake(
             ssl::stream_base::server,
-            strand_.wrap(std::bind(
-                &session::on_handshake,
-                shared_from_this(),
-                std::placeholders::_1)));
+            boost::asio::bind_executor(
+                strand_,
+                std::bind(
+                    &session::on_handshake,
+                    shared_from_this(),
+                    std::placeholders::_1)));
     }
 
     void
@@ -304,11 +310,13 @@ public:
     {
         // Read a request
         http::async_read(stream_, buffer_, req_,
-            strand_.wrap(std::bind(
-                &session::on_read,
-                shared_from_this(),
-                std::placeholders::_1,
-                std::placeholders::_2)));
+            boost::asio::bind_executor(
+                strand_,
+                std::bind(
+                    &session::on_read,
+                    shared_from_this(),
+                    std::placeholders::_1,
+                    std::placeholders::_2)));
     }
 
     void
@@ -359,10 +367,12 @@ public:
     {
         // Perform the SSL shutdown
         stream_.async_shutdown(
-            strand_.wrap(std::bind(
-                &session::on_shutdown,
-                shared_from_this(),
-                std::placeholders::_1)));
+            boost::asio::bind_executor(
+                strand_,
+                std::bind(
+                    &session::on_shutdown,
+                    shared_from_this(),
+                    std::placeholders::_1)));
     }
 
     void
@@ -387,13 +397,13 @@ class listener : public std::enable_shared_from_this<listener>
 
 public:
     listener(
-        boost::asio::io_service& ios,
+        boost::asio::io_context& ioc,
         ssl::context& ctx,
         tcp::endpoint endpoint,
         std::string const& doc_root)
         : ctx_(ctx)
-        , acceptor_(ios)
-        , socket_(ios)
+        , acceptor_(ioc)
+        , socket_(ioc)
         , doc_root_(doc_root)
     {
         boost::system::error_code ec;
@@ -416,7 +426,7 @@ public:
 
         // Start listening for connections
         acceptor_.listen(
-            boost::asio::socket_base::max_connections, ec);
+            boost::asio::socket_base::max_listen_connections, ec);
         if(ec)
         {
             fail(ec, "listen");
@@ -478,13 +488,13 @@ int main(int argc, char* argv[])
             "    http-server-async-ssl 0.0.0.0 8080 . 1\n";
         return EXIT_FAILURE;
     }
-    auto const address = boost::asio::ip::address::from_string(argv[1]);
+    auto const address = boost::asio::ip::make_address(argv[1]);
     auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
     std::string const doc_root = argv[3];
-    auto const threads = std::max<std::size_t>(1, std::atoi(argv[4]));
+    auto const threads = std::max<int>(1, std::atoi(argv[4]));
 
-    // The io_service is required for all I/O
-    boost::asio::io_service ios{threads};
+    // The io_context is required for all I/O
+    boost::asio::io_context ioc{threads};
 
     // The SSL context is required, and holds certificates
     ssl::context ctx{ssl::context::sslv23};
@@ -494,7 +504,7 @@ int main(int argc, char* argv[])
 
     // Create and launch a listening port
     std::make_shared<listener>(
-        ios,
+        ioc,
         ctx,
         tcp::endpoint{address, port},
         doc_root)->run();
@@ -504,11 +514,11 @@ int main(int argc, char* argv[])
     v.reserve(threads - 1);
     for(auto i = threads - 1; i > 0; --i)
         v.emplace_back(
-        [&ios]
+        [&ioc]
         {
-            ios.run();
+            ioc.run();
         });
-    ios.run();
+    ioc.run();
 
     return EXIT_SUCCESS;
 }

example/http/server/async/http_server_async.cpp

@@ -16,6 +16,7 @@
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
 #include <boost/beast/version.hpp>
+#include <boost/asio/bind_executor.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/config.hpp>
@@ -240,17 +241,20 @@ class session : public std::enable_shared_from_this<session>
             http::async_write(
                 self_.socket_,
                 *sp,
-                self_.strand_.wrap(std::bind(
-                    &session::on_write,
-                    self_.shared_from_this(),
-                    std::placeholders::_1,
-                    std::placeholders::_2,
-                    ! sp->keep_alive())));
+                boost::asio::bind_executor(
+                    self_.strand_,
+                    std::bind(
+                        &session::on_write,
+                        self_.shared_from_this(),
+                        std::placeholders::_1,
+                        std::placeholders::_2,
+                        ! sp->keep_alive())));
         }
     };
 
     tcp::socket socket_;
-    boost::asio::io_service::strand strand_;
+    boost::asio::strand<
+        boost::asio::io_context::executor_type> strand_;
     boost::beast::flat_buffer buffer_;
     std::string const& doc_root_;
     http::request<http::string_body> req_;
@@ -264,7 +268,7 @@ public:
         tcp::socket socket,
         std::string const& doc_root)
         : socket_(std::move(socket))
-        , strand_(socket_.get_io_service())
+        , strand_(socket_.get_executor())
         , doc_root_(doc_root)
         , lambda_(*this)
     {
@@ -282,11 +286,13 @@ public:
     {
         // Read a request
         http::async_read(socket_, buffer_, req_,
-            strand_.wrap(std::bind(
-                &session::on_read,
-                shared_from_this(),
-                std::placeholders::_1,
-                std::placeholders::_2)));
+            boost::asio::bind_executor(
+                strand_,
+                std::bind(
+                    &session::on_read,
+                    shared_from_this(),
+                    std::placeholders::_1,
+                    std::placeholders::_2)));
     }
 
     void
@@ -354,11 +360,11 @@ class listener : public std::enable_shared_from_this<listener>
 
 public:
     listener(
-        boost::asio::io_service& ios,
+        boost::asio::io_context& ioc,
         tcp::endpoint endpoint,
         std::string const& doc_root)
-        : acceptor_(ios)
-        , socket_(ios)
+        : acceptor_(ioc)
+        , socket_(ioc)
         , doc_root_(doc_root)
     {
         boost::system::error_code ec;
@@ -381,7 +387,7 @@ public:
 
         // Start listening for connections
         acceptor_.listen(
-            boost::asio::socket_base::max_connections, ec);
+            boost::asio::socket_base::max_listen_connections, ec);
         if(ec)
         {
             fail(ec, "listen");
@@ -442,17 +448,17 @@ int main(int argc, char* argv[])
             "    http-server-async 0.0.0.0 8080 . 1\n";
         return EXIT_FAILURE;
     }
-    auto const address = boost::asio::ip::address::from_string(argv[1]);
+    auto const address = boost::asio::ip::make_address(argv[1]);
     auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
     std::string const doc_root = argv[3];
-    auto const threads = std::max<std::size_t>(1, std::atoi(argv[4]));
+    auto const threads = std::max<int>(1, std::atoi(argv[4]));
 
-    // The io_service is required for all I/O
-    boost::asio::io_service ios{threads};
+    // The io_context is required for all I/O
+    boost::asio::io_context ioc{threads};
 
     // Create and launch a listening port
     std::make_shared<listener>(
-        ios,
+        ioc,
         tcp::endpoint{address, port},
         doc_root)->run();
 
@@ -461,11 +467,11 @@ int main(int argc, char* argv[])
     v.reserve(threads - 1);
     for(auto i = threads - 1; i > 0; --i)
         v.emplace_back(
-        [&ios]
+        [&ioc]
         {
-            ios.run();
+            ioc.run();
         });
-    ios.run();
+    ioc.run();
 
     return EXIT_SUCCESS;
 }

example/http/server/coro-ssl/http_server_coro_ssl.cpp

@@ -308,7 +308,7 @@ do_session(
 // Accepts incoming connections and launches the sessions
 void
 do_listen(
-    boost::asio::io_service& ios,
+    boost::asio::io_context& ioc,
     ssl::context& ctx,
     tcp::endpoint endpoint,
     std::string const& doc_root,
@@ -317,7 +317,7 @@ do_listen(
     boost::system::error_code ec;
 
     // Open the acceptor
-    tcp::acceptor acceptor(ios);
+    tcp::acceptor acceptor(ioc);
     acceptor.open(endpoint.protocol(), ec);
     if(ec)
         return fail(ec, "open");
@@ -328,19 +328,19 @@ do_listen(
         return fail(ec, "bind");
 
     // Start listening for connections
-    acceptor.listen(boost::asio::socket_base::max_connections, ec);
+    acceptor.listen(boost::asio::socket_base::max_listen_connections, ec);
     if(ec)
         return fail(ec, "listen");
 
     for(;;)
     {
-        tcp::socket socket(ios);
+        tcp::socket socket(ioc);
         acceptor.async_accept(socket, yield[ec]);
         if(ec)
             fail(ec, "accept");
         else
             boost::asio::spawn(
-                acceptor.get_io_service(),
+                acceptor.get_executor().context(),
                 std::bind(
                     &do_session,
                     std::move(socket),
@@ -361,13 +361,13 @@ int main(int argc, char* argv[])
             "    http-server-coro-ssl 0.0.0.0 8080 . 1\n";
         return EXIT_FAILURE;
     }
-    auto const address = boost::asio::ip::address::from_string(argv[1]);
+    auto const address = boost::asio::ip::make_address(argv[1]);
     auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
     std::string const doc_root = argv[3];
-    auto const threads = std::max<std::size_t>(1, std::atoi(argv[4]));
+    auto const threads = std::max<int>(1, std::atoi(argv[4]));
 
-    // The io_service is required for all I/O
-    boost::asio::io_service ios{threads};
+    // The io_context is required for all I/O
+    boost::asio::io_context ioc{threads};
 
     // The SSL context is required, and holds certificates
     ssl::context ctx{ssl::context::sslv23};
@@ -376,10 +376,10 @@ int main(int argc, char* argv[])
     load_server_certificate(ctx);
 
     // Spawn a listening port
-    boost::asio::spawn(ios,
+    boost::asio::spawn(ioc,
         std::bind(
             &do_listen,
-            std::ref(ios),
+            std::ref(ioc),
             std::ref(ctx),
             tcp::endpoint{address, port},
             doc_root,
@@ -390,11 +390,11 @@ int main(int argc, char* argv[])
     v.reserve(threads - 1);
     for(auto i = threads - 1; i > 0; --i)
         v.emplace_back(
-        [&ios]
+        [&ioc]
         {
-            ios.run();
+            ioc.run();
         });
-    ios.run();
+    ioc.run();
 
     return EXIT_SUCCESS;
 }

example/http/server/coro/http_server_coro.cpp

@@ -293,7 +293,7 @@ do_session(
 // Accepts incoming connections and launches the sessions
 void
 do_listen(
-    boost::asio::io_service& ios,
+    boost::asio::io_context& ioc,
     tcp::endpoint endpoint,
     std::string const& doc_root,
     boost::asio::yield_context yield)
@@ -301,7 +301,7 @@ do_listen(
     boost::system::error_code ec;
 
     // Open the acceptor
-    tcp::acceptor acceptor(ios);
+    tcp::acceptor acceptor(ioc);
     acceptor.open(endpoint.protocol(), ec);
     if(ec)
         return fail(ec, "open");
@@ -312,19 +312,19 @@ do_listen(
         return fail(ec, "bind");
 
     // Start listening for connections
-    acceptor.listen(boost::asio::socket_base::max_connections, ec);
+    acceptor.listen(boost::asio::socket_base::max_listen_connections, ec);
     if(ec)
         return fail(ec, "listen");
 
     for(;;)
     {
-        tcp::socket socket(ios);
+        tcp::socket socket(ioc);
         acceptor.async_accept(socket, yield[ec]);
         if(ec)
             fail(ec, "accept");
         else
             boost::asio::spawn(
-                acceptor.get_io_service(),
+                acceptor.get_executor().context(),
                 std::bind(
                     &do_session,
                     std::move(socket),
@@ -344,19 +344,19 @@ int main(int argc, char* argv[])
             "    http-server-coro 0.0.0.0 8080 . 1\n";
         return EXIT_FAILURE;
     }
-    auto const address = boost::asio::ip::address::from_string(argv[1]);
+    auto const address = boost::asio::ip::make_address(argv[1]);
     auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
     std::string const doc_root = argv[3];
-    auto const threads = std::max<std::size_t>(1, std::atoi(argv[4]));
+    auto const threads = std::max<int>(1, std::atoi(argv[4]));
 
-    // The io_service is required for all I/O
-    boost::asio::io_service ios{threads};
+    // The io_context is required for all I/O
+    boost::asio::io_context ioc{threads};
 
     // Spawn a listening port
-    boost::asio::spawn(ios,
+    boost::asio::spawn(ioc,
         std::bind(
             &do_listen,
-            std::ref(ios),
+            std::ref(ioc),
             tcp::endpoint{address, port},
             doc_root,
             std::placeholders::_1));
@@ -366,11 +366,11 @@ int main(int argc, char* argv[])
     v.reserve(threads - 1);
     for(auto i = threads - 1; i > 0; --i)
         v.emplace_back(
-        [&ios]
+        [&ioc]
         {
-            ios.run();
+            ioc.run();
         });
-    ios.run();
+    ioc.run();
 
     return EXIT_SUCCESS;
 }

example/http/server/fast/http_server_fast.cpp

@@ -97,7 +97,7 @@ private:
     std::string doc_root_;
 
     // The socket for the currently connected client.
-    tcp::socket socket_{acceptor_.get_io_service()};
+    tcp::socket socket_{acceptor_.get_executor().context()};
 
     // The buffer for performing reads
     boost::beast::flat_static_buffer<8192> buffer_;
@@ -110,7 +110,7 @@ private:
 
     // The timer putting a time limit on requests.
     boost::asio::basic_waitable_timer<std::chrono::steady_clock> request_deadline_{
-        acceptor_.get_io_service(), (std::chrono::steady_clock::time_point::max)()};
+        acceptor_.get_executor().context(), (std::chrono::steady_clock::time_point::max)()};
 
     // The string-based response message.
     boost::optional<http::response<http::string_body, http::basic_fields<alloc_t>>> string_response_;
@@ -142,7 +142,7 @@ private:
                 else
                 {
                     // Request must be fully processed within 60 seconds.
-                    request_deadline_.expires_from_now(
+                    request_deadline_.expires_after(
                         std::chrono::seconds(60));
 
                     read_request();
@@ -288,7 +288,7 @@ private:
     void check_deadline()
     {
         // The deadline may have moved, so check it has really passed.
-        if (request_deadline_.expires_at() <= std::chrono::steady_clock::now())
+        if (request_deadline_.expiry() <= std::chrono::steady_clock::now())
         {
             // Close socket to cancel any outstanding operation.
             boost::beast::error_code ec;
@@ -322,14 +322,14 @@ int main(int argc, char* argv[])
             return EXIT_FAILURE;
         }
 
-        auto address = ip::address::from_string(argv[1]);
+        auto const address = boost::asio::ip::make_address(argv[1]);
         unsigned short port = static_cast<unsigned short>(std::atoi(argv[2]));
         std::string doc_root = argv[3];
         int num_workers = std::atoi(argv[4]);
         bool spin = (std::strcmp(argv[5], "spin") == 0);
 
-        boost::asio::io_service ios{1};
-        tcp::acceptor acceptor{ios, {address, port}};
+        boost::asio::io_context ioc{1};
+        tcp::acceptor acceptor{ioc, {address, port}};
 
         std::list<http_worker> workers;
         for (int i = 0; i < num_workers; ++i)
@@ -339,9 +339,9 @@ int main(int argc, char* argv[])
         }
 
         if (spin)
-          for (;;) ios.poll();
+          for (;;) ioc.poll();
         else
-          ios.run();
+          ioc.run();
     }
     catch (const std::exception& e)
     {

example/http/server/flex/http_server_flex.cpp

@@ -19,6 +19,7 @@
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
 #include <boost/beast/version.hpp>
+#include <boost/asio/bind_executor.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <boost/asio/strand.hpp>
@@ -255,12 +256,14 @@ class session
             http::async_write(
                 self_.derived().stream(),
                 *sp,
-                self_.strand_.wrap(std::bind(
-                    &session::on_write,
-                    self_.derived().shared_from_this(),
-                    std::placeholders::_1,
-                    std::placeholders::_2,
-                    ! sp->keep_alive())));
+                boost::asio::bind_executor(
+                    self_.strand_,
+                    std::bind(
+                        &session::on_write,
+                        self_.derived().shared_from_this(),
+                        std::placeholders::_1,
+                        std::placeholders::_2,
+                        ! sp->keep_alive())));
         }
     };
 
@@ -270,19 +273,20 @@ class session
     send_lambda lambda_;
 
 protected:
-    boost::asio::io_service::strand strand_;
+    boost::asio::strand<
+        boost::asio::io_context::executor_type> strand_;
     boost::beast::flat_buffer buffer_;
 
 public:
     // Take ownership of the buffer
     explicit
     session(
-        boost::asio::io_service& ios,
+        boost::asio::io_context& ioc,
         boost::beast::flat_buffer buffer,
         std::string const& doc_root)
         : doc_root_(doc_root)
         , lambda_(*this)
-        , strand_(ios)
+        , strand_(ioc.get_executor())
         , buffer_(std::move(buffer))
     {
     }
@@ -295,11 +299,13 @@ public:
             derived().stream(),
             buffer_,
             req_,
-            strand_.wrap(std::bind(
-                &session::on_read,
-                derived().shared_from_this(),
-                std::placeholders::_1,
-                std::placeholders::_2)));
+            boost::asio::bind_executor(
+                strand_,
+                std::bind(
+                    &session::on_read,
+                    derived().shared_from_this(),
+                    std::placeholders::_1,
+                    std::placeholders::_2)));
     }
 
     void
@@ -352,7 +358,8 @@ class plain_session
     , public std::enable_shared_from_this<plain_session>
 {
     tcp::socket socket_;
-    boost::asio::io_service::strand strand_;
+    boost::asio::strand<
+        boost::asio::io_context::executor_type> strand_;
 
 public:
     // Create the session
@@ -361,11 +368,11 @@ public:
         boost::beast::flat_buffer buffer,
         std::string const& doc_root)
         : session<plain_session>(
-            socket.get_io_service(),
+            socket.get_executor().context(),
             std::move(buffer),
             doc_root)
         , socket_(std::move(socket))
-        , strand_(socket_.get_io_service())
+        , strand_(socket_.get_executor())
     {
     }
 
@@ -401,7 +408,8 @@ class ssl_session
 {
     tcp::socket socket_;
     ssl::stream<tcp::socket&> stream_;
-    boost::asio::io_service::strand strand_;
+    boost::asio::strand<
+        boost::asio::io_context::executor_type> strand_;
 
 public:
     // Create the session
@@ -411,12 +419,12 @@ public:
         boost::beast::flat_buffer buffer,
         std::string const& doc_root)
         : session<ssl_session>(
-            socket.get_io_service(),
+            socket.get_executor().context(),
             std::move(buffer),
             doc_root)
         , socket_(std::move(socket))
         , stream_(socket_, ctx)
-        , strand_(stream_.get_io_service())
+        , strand_(stream_.get_executor())
     {
     }
 
@@ -436,11 +444,13 @@ public:
         stream_.async_handshake(
             ssl::stream_base::server,
             buffer_.data(),
-            strand_.wrap(std::bind(
-                &ssl_session::on_handshake,
-                shared_from_this(),
-                std::placeholders::_1,
-                std::placeholders::_2)));
+            boost::asio::bind_executor(
+                strand_,
+                std::bind(
+                    &ssl_session::on_handshake,
+                    shared_from_this(),
+                    std::placeholders::_1,
+                    std::placeholders::_2)));
     }
     void
     on_handshake(
@@ -461,10 +471,12 @@ public:
     {
         // Perform the SSL shutdown
         stream_.async_shutdown(
-            strand_.wrap(std::bind(
-                &ssl_session::on_shutdown,
-                shared_from_this(),
-                std::placeholders::_1)));
+            boost::asio::bind_executor(
+                strand_,
+                std::bind(
+                    &ssl_session::on_shutdown,
+                    shared_from_this(),
+                    std::placeholders::_1)));
     }
 
     void
@@ -484,7 +496,8 @@ class detect_session : public std::enable_shared_from_this<detect_session>
 {
     tcp::socket socket_;
     ssl::context& ctx_;
-    boost::asio::io_service::strand strand_;
+    boost::asio::strand<
+        boost::asio::io_context::executor_type> strand_;
     std::string const& doc_root_;
     boost::beast::flat_buffer buffer_;
 
@@ -496,7 +509,7 @@ public:
         std::string const& doc_root)
         : socket_(std::move(socket))
         , ctx_(ctx)
-        , strand_(socket_.get_io_service())
+        , strand_(socket_.get_executor())
         , doc_root_(doc_root)
     {
     }
@@ -508,11 +521,13 @@ public:
         async_detect_ssl(
             socket_,
             buffer_,
-            strand_.wrap(std::bind(
-                &detect_session::on_detect,
-                shared_from_this(),
-                std::placeholders::_1,
-                std::placeholders::_2)));
+            boost::asio::bind_executor(
+                strand_,
+                std::bind(
+                    &detect_session::on_detect,
+                    shared_from_this(),
+                    std::placeholders::_1,
+                    std::placeholders::_2)));
 
     }
 
@@ -545,21 +560,22 @@ public:
 class listener : public std::enable_shared_from_this<listener>
 {
     ssl::context& ctx_;
-    boost::asio::io_service::strand strand_;
+    boost::asio::strand<
+        boost::asio::io_context::executor_type> strand_;
     tcp::acceptor acceptor_;
     tcp::socket socket_;
     std::string const& doc_root_;
 
 public:
     listener(
-        boost::asio::io_service& ios,
+        boost::asio::io_context& ioc,
         ssl::context& ctx,
         tcp::endpoint endpoint,
         std::string const& doc_root)
         : ctx_(ctx)
-        , strand_(ios)
-        , acceptor_(ios)
-        , socket_(ios)
+        , strand_(ioc.get_executor())
+        , acceptor_(ioc)
+        , socket_(ioc)
         , doc_root_(doc_root)
     {
         boost::system::error_code ec;
@@ -582,7 +598,7 @@ public:
 
         // Start listening for connections
         acceptor_.listen(
-            boost::asio::socket_base::max_connections, ec);
+            boost::asio::socket_base::max_listen_connections, ec);
         if(ec)
         {
             fail(ec, "listen");
@@ -644,13 +660,13 @@ int main(int argc, char* argv[])
             "    http-server-sync 0.0.0.0 8080 .\n";
         return EXIT_FAILURE;
     }
-    auto const address = boost::asio::ip::address::from_string(argv[1]);
+    auto const address = boost::asio::ip::make_address(argv[1]);
     auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
     std::string const doc_root = argv[3];
-    auto const threads = std::max<std::size_t>(1, std::atoi(argv[4]));
+    auto const threads = std::max<int>(1, std::atoi(argv[4]));
 
-    // The io_service is required for all I/O
-    boost::asio::io_service ios{threads};
+    // The io_context is required for all I/O
+    boost::asio::io_context ioc{threads};
 
     // The SSL context is required, and holds certificates
     ssl::context ctx{ssl::context::sslv23};
@@ -660,7 +676,7 @@ int main(int argc, char* argv[])
 
     // Create and launch a listening port
     std::make_shared<listener>(
-        ios,
+        ioc,
         ctx,
         tcp::endpoint{address, port},
         doc_root)->run();
@@ -670,11 +686,11 @@ int main(int argc, char* argv[])
     v.reserve(threads - 1);
     for(auto i = threads - 1; i > 0; --i)
         v.emplace_back(
-        [&ios]
+        [&ioc]
         {
-            ios.run();
+            ioc.run();
         });
-    ios.run();
+    ioc.run();
 
     return EXIT_SUCCESS;
 }

example/http/server/small/http_server_small.cpp

@@ -75,7 +75,7 @@ private:
 
     // The timer for putting a deadline on connection processing.
     boost::asio::basic_waitable_timer<std::chrono::steady_clock> deadline_{
-        socket_.get_io_service(), std::chrono::seconds(60)};
+        socket_.get_executor().context(), std::chrono::seconds(60)};
 
     // Asynchronously receive a complete request message.
     void
@@ -231,16 +231,16 @@ main(int argc, char* argv[])
             return EXIT_FAILURE;
         }
 
-        auto address = ip::address::from_string(argv[1]);
+        auto const address = boost::asio::ip::make_address(argv[1]);
         unsigned short port = static_cast<unsigned short>(std::atoi(argv[2]));
 
-        boost::asio::io_service ios{1};
+        boost::asio::io_context ioc{1};
 
-        tcp::acceptor acceptor{ios, {address, port}};
-        tcp::socket socket{ios};
+        tcp::acceptor acceptor{ioc, {address, port}};
+        tcp::socket socket{ioc};
         http_server(acceptor, socket);
 
-        ios.run();
+        ioc.run();
     }
     catch(std::exception const& e)
     {

example/http/server/stackless-ssl/http_server_stackless_ssl.cpp

@@ -18,6 +18,7 @@
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
 #include <boost/beast/version.hpp>
+#include <boost/asio/bind_executor.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
@@ -247,18 +248,21 @@ class session
             http::async_write(
                 self_.socket_,
                 *sp,
-                self_.strand_.wrap(std::bind(
-                    &session::loop,
-                    self_.shared_from_this(),
-                    std::placeholders::_1,
-                    std::placeholders::_2,
-                    ! sp->keep_alive())));
+                boost::asio::bind_executor(
+                    self_.strand_,
+                    std::bind(
+                        &session::loop,
+                        self_.shared_from_this(),
+                        std::placeholders::_1,
+                        std::placeholders::_2,
+                        ! sp->keep_alive())));
         }
     };
 
     tcp::socket socket_;
     ssl::stream<tcp::socket&> stream_;
-    boost::asio::io_service::strand strand_;
+    boost::asio::strand<
+        boost::asio::io_context::executor_type> strand_;
     boost::beast::flat_buffer buffer_;
     std::string const& doc_root_;
     http::request<http::string_body> req_;
@@ -274,7 +278,7 @@ public:
         std::string const& doc_root)
         : socket_(std::move(socket))
         , stream_(socket_, ctx)
-        , strand_(socket_.get_io_service())
+        , strand_(socket_.get_executor())
         , doc_root_(doc_root)
         , lambda_(*this)
     {
@@ -300,12 +304,14 @@ public:
             // Perform the SSL handshake
             yield stream_.async_handshake(
                 ssl::stream_base::server,
-                strand_.wrap(std::bind(
-                    &session::loop,
-                    shared_from_this(),
-                    std::placeholders::_1,
-                    0,
-                    false)));
+                boost::asio::bind_executor(
+                    strand_,
+                    std::bind(
+                        &session::loop,
+                        shared_from_this(),
+                        std::placeholders::_1,
+                        0,
+                        false)));
             if(ec)
                 return fail(ec, "handshake");
 
@@ -313,12 +319,14 @@ public:
             {
                 // Read a request
                 yield http::async_read(stream_, buffer_, req_,
-                    strand_.wrap(std::bind(
-                        &session::loop,
-                        shared_from_this(),
-                        std::placeholders::_1,
-                        std::placeholders::_2,
-                        false)));
+                    boost::asio::bind_executor(
+                        strand_,
+                        std::bind(
+                            &session::loop,
+                            shared_from_this(),
+                            std::placeholders::_1,
+                            std::placeholders::_2,
+                            false)));
                 if(ec == http::error::end_of_stream)
                 {
                     // The remote host closed the connection
@@ -344,12 +352,14 @@ public:
 
             // Perform the SSL shutdown
             yield stream_.async_shutdown(
-                strand_.wrap(std::bind(
-                    &session::loop,
-                    shared_from_this(),
-                    std::placeholders::_1,
-                    0,
-                    false)));
+                boost::asio::bind_executor(
+                    strand_,
+                    std::bind(
+                        &session::loop,
+                        shared_from_this(),
+                        std::placeholders::_1,
+                        0,
+                        false)));
             if(ec)
                 return fail(ec, "shutdown");
 
@@ -373,13 +383,13 @@ class listener
 
 public:
     listener(
-        boost::asio::io_service& ios,
+        boost::asio::io_context& ioc,
         ssl::context& ctx,
         tcp::endpoint endpoint,
         std::string const& doc_root)
         : ctx_(ctx)
-        , acceptor_(ios)
-        , socket_(ios)
+        , acceptor_(ioc)
+        , socket_(ioc)
         , doc_root_(doc_root)
     {
         boost::system::error_code ec;
@@ -402,7 +412,7 @@ public:
 
         // Start listening for connections
         acceptor_.listen(
-            boost::asio::socket_base::max_connections, ec);
+            boost::asio::socket_base::max_listen_connections, ec);
         if(ec)
         {
             fail(ec, "listen");
@@ -464,13 +474,13 @@ int main(int argc, char* argv[])
             "    http-server-stackless-ssl 0.0.0.0 8080 . 1\n";
         return EXIT_FAILURE;
     }
-    auto const address = boost::asio::ip::address::from_string(argv[1]);
+    auto const address = boost::asio::ip::make_address(argv[1]);
     auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
     std::string const doc_root = argv[3];
-    auto const threads = std::max<std::size_t>(1, std::atoi(argv[4]));
+    auto const threads = std::max<int>(1, std::atoi(argv[4]));
 
-    // The io_service is required for all I/O
-    boost::asio::io_service ios{threads};
+    // The io_context is required for all I/O
+    boost::asio::io_context ioc{threads};
 
     // The SSL context is required, and holds certificates
     ssl::context ctx{ssl::context::sslv23};
@@ -480,7 +490,7 @@ int main(int argc, char* argv[])
 
     // Create and launch a listening port
     std::make_shared<listener>(
-        ios,
+        ioc,
         ctx,
         tcp::endpoint{address, port},
         doc_root)->run();
@@ -490,11 +500,11 @@ int main(int argc, char* argv[])
     v.reserve(threads - 1);
     for(auto i = threads - 1; i > 0; --i)
         v.emplace_back(
-        [&ios]
+        [&ioc]
         {
-            ios.run();
+            ioc.run();
         });
-    ios.run();
+    ioc.run();
 
     return EXIT_SUCCESS;
 }

example/http/server/stackless/http_server_stackless.cpp

@@ -16,6 +16,7 @@
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
 #include <boost/beast/version.hpp>
+#include <boost/asio/bind_executor.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/strand.hpp>
@@ -244,17 +245,20 @@ class session
             http::async_write(
                 self_.socket_,
                 *sp,
-                self_.strand_.wrap(std::bind(
-                    &session::loop,
-                    self_.shared_from_this(),
-                    std::placeholders::_1,
-                    std::placeholders::_2,
-                    ! sp->keep_alive())));
+                boost::asio::bind_executor(
+                    self_.strand_,
+                    std::bind(
+                        &session::loop,
+                        self_.shared_from_this(),
+                        std::placeholders::_1,
+                        std::placeholders::_2,
+                        ! sp->keep_alive())));
         }
     };
 
     tcp::socket socket_;
-    boost::asio::io_service::strand strand_;
+    boost::asio::strand<
+        boost::asio::io_context::executor_type> strand_;
     boost::beast::flat_buffer buffer_;
     std::string const& doc_root_;
     http::request<http::string_body> req_;
@@ -268,7 +272,7 @@ public:
         tcp::socket socket,
         std::string const& doc_root)
         : socket_(std::move(socket))
-        , strand_(socket_.get_io_service())
+        , strand_(socket_.get_executor())
         , doc_root_(doc_root)
         , lambda_(*this)
     {
@@ -295,12 +299,14 @@ public:
             {
                 // Read a request
                 yield http::async_read(socket_, buffer_, req_,
-                    strand_.wrap(std::bind(
-                        &session::loop,
-                        shared_from_this(),
-                        std::placeholders::_1,
-                        std::placeholders::_2,
-                        false)));
+                    boost::asio::bind_executor(
+                        strand_,
+                        std::bind(
+                            &session::loop,
+                            shared_from_this(),
+                            std::placeholders::_1,
+                            std::placeholders::_2,
+                            false)));
                 if(ec == http::error::end_of_stream)
                 {
                     // The remote host closed the connection
@@ -346,11 +352,11 @@ class listener
 
 public:
     listener(
-        boost::asio::io_service& ios,
+        boost::asio::io_context& ioc,
         tcp::endpoint endpoint,
         std::string const& doc_root)
-        : acceptor_(ios)
-        , socket_(ios)
+        : acceptor_(ioc)
+        , socket_(ioc)
         , doc_root_(doc_root)
     {
         boost::system::error_code ec;
@@ -372,7 +378,7 @@ public:
         }
 
         // Start listening for connections
-        acceptor_.listen(boost::asio::socket_base::max_connections, ec);
+        acceptor_.listen(boost::asio::socket_base::max_listen_connections, ec);
         if(ec)
         {
             fail(ec, "listen");
@@ -433,17 +439,17 @@ int main(int argc, char* argv[])
             "    http-server-stackless 0.0.0.0 8080 . 1\n";
         return EXIT_FAILURE;
     }
-    auto const address = boost::asio::ip::address::from_string(argv[1]);
+    auto const address = boost::asio::ip::make_address(argv[1]);
     auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
     std::string const doc_root = argv[3];
-    auto const threads = std::max<std::size_t>(1, std::atoi(argv[4]));
+    auto const threads = std::max<int>(1, std::atoi(argv[4]));
 
-    // The io_service is required for all I/O
-    boost::asio::io_service ios{threads};
+    // The io_context is required for all I/O
+    boost::asio::io_context ioc{threads};
 
     // Create and launch a listening port
     std::make_shared<listener>(
-        ios,
+        ioc,
         tcp::endpoint{address, port},
         doc_root)->run();
 
@@ -452,11 +458,11 @@ int main(int argc, char* argv[])
     v.reserve(threads - 1);
     for(auto i = threads - 1; i > 0; --i)
         v.emplace_back(
-        [&ios]
+        [&ioc]
         {
-            ios.run();
+            ioc.run();
         });
-    ios.run();
+    ioc.run();
 
     return EXIT_SUCCESS;
 }

example/http/server/sync-ssl/http_server_sync_ssl.cpp

@@ -311,12 +311,12 @@ int main(int argc, char* argv[])
                 "    http-server-sync-ssl 0.0.0.0 8080 .\n";
             return EXIT_FAILURE;
         }
-        auto const address = boost::asio::ip::address::from_string(argv[1]);
+        auto const address = boost::asio::ip::make_address(argv[1]);
         auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
         std::string const doc_root = argv[3];
 
-        // The io_service is required for all I/O
-        boost::asio::io_service ios{1};
+        // The io_context is required for all I/O
+        boost::asio::io_context ioc{1};
 
         // The SSL context is required, and holds certificates
         ssl::context ctx{ssl::context::sslv23};
@@ -325,11 +325,11 @@ int main(int argc, char* argv[])
         load_server_certificate(ctx);
 
         // The acceptor receives incoming connections
-        tcp::acceptor acceptor{ios, {address, port}};
+        tcp::acceptor acceptor{ioc, {address, port}};
         for(;;)
         {
             // This will receive the new connection
-            tcp::socket socket{ios};
+            tcp::socket socket{ioc};
 
             // Block until we get a connection
             acceptor.accept(socket);

example/http/server/sync/http_server_sync.cpp

@@ -298,19 +298,19 @@ int main(int argc, char* argv[])
                 "    http-server-sync 0.0.0.0 8080 .\n";
             return EXIT_FAILURE;
         }
-        auto const address = boost::asio::ip::address::from_string(argv[1]);
+        auto const address = boost::asio::ip::make_address(argv[1]);
         auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
         std::string const doc_root = argv[3];
 
-        // The io_service is required for all I/O
-        boost::asio::io_service ios{1};
+        // The io_context is required for all I/O
+        boost::asio::io_context ioc{1};
 
         // The acceptor receives incoming connections
-        tcp::acceptor acceptor{ios, {address, port}};
+        tcp::acceptor acceptor{ioc, {address, port}};
         for(;;)
         {
             // This will receive the new connection
-            tcp::socket socket{ios};
+            tcp::socket socket{ioc};
 
             // Block until we get a connection
             acceptor.accept(socket);