diff --git a/CHANGELOG.md b/CHANGELOG.md index 1943e0da..37bdd5be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Version 259: * Fix coverage collection in AzP CI * Improve performance of `http::string_to_verb` * Replace uses of `net::coroutine` with `asio::coroutine` +* Replace uses of `net::spawn` with `asio::spawn` -------------------------------------------------------------------------------- diff --git a/doc/qbk/03_core/1_refresher.qbk b/doc/qbk/03_core/1_refresher.qbk index 32daadd4..568d021f 100644 --- a/doc/qbk/03_core/1_refresher.qbk +++ b/doc/qbk/03_core/1_refresher.qbk @@ -290,7 +290,7 @@ in place of the completion handler. The same `async_write` function overload can work with a [@https://en.wikipedia.org/wiki/Fiber_(computer_science) ['fiber]] launched with -[@boost:/doc/html/boost_asio/reference/spawn/overload1.html `net::spawn`]: +[@boost:/doc/html/boost_asio/reference/spawn/overload1.html `asio::spawn`]: [code_core_1_refresher_5s] diff --git a/example/http/client/coro-ssl/http_client_coro_ssl.cpp b/example/http/client/coro-ssl/http_client_coro_ssl.cpp index 83ae32da..8454db90 100644 --- a/example/http/client/coro-ssl/http_client_coro_ssl.cpp +++ b/example/http/client/coro-ssl/http_client_coro_ssl.cpp @@ -162,7 +162,7 @@ int main(int argc, char** argv) ctx.set_verify_mode(ssl::verify_peer); // Launch the asynchronous operation - net::spawn(ioc, std::bind( + boost::asio::spawn(ioc, std::bind( &do_session, std::string(host), std::string(port), diff --git a/example/http/client/coro/http_client_coro.cpp b/example/http/client/coro/http_client_coro.cpp index 3bc1c4b3..274ec05e 100644 --- a/example/http/client/coro/http_client_coro.cpp +++ b/example/http/client/coro/http_client_coro.cpp @@ -127,7 +127,7 @@ int main(int argc, char** argv) net::io_context ioc; // Launch the asynchronous operation - net::spawn(ioc, std::bind( + boost::asio::spawn(ioc, std::bind( &do_session, std::string(host), std::string(port), diff --git a/example/http/server/coro-ssl/http_server_coro_ssl.cpp b/example/http/server/coro-ssl/http_server_coro_ssl.cpp index d0c7e85e..a733c624 100644 --- a/example/http/server/coro-ssl/http_server_coro_ssl.cpp +++ b/example/http/server/coro-ssl/http_server_coro_ssl.cpp @@ -371,7 +371,7 @@ do_listen( if(ec) fail(ec, "accept"); else - net::spawn( + boost::asio::spawn( acceptor.get_executor(), std::bind( &do_session, @@ -408,7 +408,7 @@ int main(int argc, char* argv[]) load_server_certificate(ctx); // Spawn a listening port - net::spawn(ioc, + boost::asio::spawn(ioc, std::bind( &do_listen, std::ref(ioc), diff --git a/example/http/server/coro/http_server_coro.cpp b/example/http/server/coro/http_server_coro.cpp index 1c3f440b..a8baae64 100644 --- a/example/http/server/coro/http_server_coro.cpp +++ b/example/http/server/coro/http_server_coro.cpp @@ -334,7 +334,7 @@ do_listen( if(ec) fail(ec, "accept"); else - net::spawn( + boost::asio::spawn( acceptor.get_executor(), std::bind( &do_session, @@ -364,7 +364,7 @@ int main(int argc, char* argv[]) net::io_context ioc{threads}; // Spawn a listening port - net::spawn(ioc, + boost::asio::spawn(ioc, std::bind( &do_listen, std::ref(ioc), diff --git a/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp b/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp index 244ae92f..d4d8ba32 100644 --- a/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp +++ b/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp @@ -153,7 +153,7 @@ int main(int argc, char** argv) load_root_certificates(ctx); // Launch the asynchronous operation - net::spawn(ioc, std::bind( + boost::asio::spawn(ioc, std::bind( &do_session, std::string(host), std::string(port), diff --git a/example/websocket/client/coro/websocket_client_coro.cpp b/example/websocket/client/coro/websocket_client_coro.cpp index d6a119ad..359015b2 100644 --- a/example/websocket/client/coro/websocket_client_coro.cpp +++ b/example/websocket/client/coro/websocket_client_coro.cpp @@ -132,7 +132,7 @@ int main(int argc, char** argv) net::io_context ioc; // Launch the asynchronous operation - net::spawn(ioc, std::bind( + boost::asio::spawn(ioc, std::bind( &do_session, std::string(host), std::string(port), diff --git a/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp b/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp index 03c48e7f..3e1785f0 100644 --- a/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp +++ b/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp @@ -148,7 +148,7 @@ do_listen( if(ec) fail(ec, "accept"); else - net::spawn( + boost::asio::spawn( acceptor.get_executor(), std::bind( &do_session, @@ -183,7 +183,7 @@ int main(int argc, char* argv[]) load_server_certificate(ctx); // Spawn a listening port - net::spawn(ioc, + boost::asio::spawn(ioc, std::bind( &do_listen, std::ref(ioc), diff --git a/example/websocket/server/coro/websocket_server_coro.cpp b/example/websocket/server/coro/websocket_server_coro.cpp index 5901742e..e15b0107 100644 --- a/example/websocket/server/coro/websocket_server_coro.cpp +++ b/example/websocket/server/coro/websocket_server_coro.cpp @@ -129,7 +129,7 @@ do_listen( if(ec) fail(ec, "accept"); else - net::spawn( + boost::asio::spawn( acceptor.get_executor(), std::bind( &do_session, @@ -158,7 +158,7 @@ int main(int argc, char* argv[]) net::io_context ioc(threads); // Spawn a listening port - net::spawn(ioc, + boost::asio::spawn(ioc, std::bind( &do_listen, std::ref(ioc), diff --git a/example/websocket/server/fast/websocket_server_fast.cpp b/example/websocket/server/fast/websocket_server_fast.cpp index 77bcdfe2..7f2a5e3c 100644 --- a/example/websocket/server/fast/websocket_server_fast.cpp +++ b/example/websocket/server/fast/websocket_server_fast.cpp @@ -100,7 +100,7 @@ do_sync_session(websocket::stream& ws) for(;;) { beast::flat_buffer buffer; - + ws.read(buffer, ec); if(ec == websocket::error::closed) break; @@ -405,7 +405,7 @@ do_coro_listen( continue; } - net::spawn( + boost::asio::spawn( acceptor.get_executor(), std::bind( &do_coro_session, @@ -456,7 +456,7 @@ int main(int argc, char* argv[]) static_cast(port + 1u)})->run(); // Create coro port - net::spawn(ioc, + boost::asio::spawn(ioc, std::bind( &do_coro_listen, std::ref(ioc), diff --git a/test/doc/core_1_refresher.cpp b/test/doc/core_1_refresher.cpp index 2a467dbe..8b15dde5 100644 --- a/test/doc/core_1_refresher.cpp +++ b/test/doc/core_1_refresher.cpp @@ -73,7 +73,7 @@ snippets() } { //[code_core_1_refresher_5s - net::spawn( + asio::spawn( [&sock](net::yield_context yield) { std::size_t bytes_transferred = net::async_write(sock, @@ -375,7 +375,7 @@ async_write( >::return_type { //[code_core_1_refresher_10 - + return net::async_initiate< CompletionToken, void(error_code, std::size_t)>( diff --git a/test/extras/include/boost/beast/test/yield_to.hpp b/test/extras/include/boost/beast/test/yield_to.hpp index c084b268..e0064830 100644 --- a/test/extras/include/boost/beast/test/yield_to.hpp +++ b/test/extras/include/boost/beast/test/yield_to.hpp @@ -120,7 +120,7 @@ void enable_yield_to:: spawn(F0&& f, FN&&... fn) { - net::spawn(ioc_, + asio::spawn(ioc_, [&](yield_context yield) { f(yield);