From 272b6f23e44d3b94b6977945085dd6f49b622d18 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 1 Mar 2019 11:57:58 -0800 Subject: [PATCH] Examples use flat_buffer fix #1488 --- CHANGELOG.md | 1 + .../client/async-ssl/websocket_client_async_ssl.cpp | 2 +- example/websocket/client/async/websocket_client_async.cpp | 2 +- .../websocket/client/coro-ssl/websocket_client_coro_ssl.cpp | 2 +- example/websocket/client/coro/websocket_client_coro.cpp | 2 +- .../websocket/client/sync-ssl/websocket_client_sync_ssl.cpp | 2 +- example/websocket/client/sync/websocket_client_sync.cpp | 2 +- .../server/async-ssl/websocket_server_async_ssl.cpp | 2 +- example/websocket/server/async/websocket_server_async.cpp | 2 +- .../websocket/server/coro-ssl/websocket_server_coro_ssl.cpp | 2 +- example/websocket/server/coro/websocket_server_coro.cpp | 2 +- example/websocket/server/fast/websocket_server_fast.cpp | 6 +++--- .../server/stackless-ssl/websocket_server_stackless_ssl.cpp | 2 +- .../server/stackless/websocket_server_stackless.cpp | 2 +- .../websocket/server/sync-ssl/websocket_server_sync_ssl.cpp | 2 +- example/websocket/server/sync/websocket_server_sync.cpp | 2 +- test/bench/wsload/wsload.cpp | 2 +- 17 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fb3e577..4fbe273e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ Version 225: * Tidy up an unused function * Fix wsload jamfile +* Examples use flat_buffer -------------------------------------------------------------------------------- diff --git a/example/websocket/client/async-ssl/websocket_client_async_ssl.cpp b/example/websocket/client/async-ssl/websocket_client_async_ssl.cpp index 6e7a1bbb..2d886c0d 100644 --- a/example/websocket/client/async-ssl/websocket_client_async_ssl.cpp +++ b/example/websocket/client/async-ssl/websocket_client_async_ssl.cpp @@ -47,7 +47,7 @@ class session : public std::enable_shared_from_this tcp::resolver resolver_; websocket::stream< beast::ssl_stream> ws_; - beast::multi_buffer buffer_; + beast::flat_buffer buffer_; std::string host_; std::string text_; diff --git a/example/websocket/client/async/websocket_client_async.cpp b/example/websocket/client/async/websocket_client_async.cpp index eda86911..d5bf8ee0 100644 --- a/example/websocket/client/async/websocket_client_async.cpp +++ b/example/websocket/client/async/websocket_client_async.cpp @@ -41,7 +41,7 @@ class session : public std::enable_shared_from_this { tcp::resolver resolver_; websocket::stream ws_; - beast::multi_buffer buffer_; + beast::flat_buffer buffer_; std::string host_; std::string text_; 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 a8525214..e7b2cc51 100644 --- a/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp +++ b/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp @@ -108,7 +108,7 @@ do_session( return fail(ec, "write"); // This buffer will hold the incoming message - beast::multi_buffer buffer; + beast::flat_buffer buffer; // Read a message into our buffer ws.async_read(buffer, yield[ec]); diff --git a/example/websocket/client/coro/websocket_client_coro.cpp b/example/websocket/client/coro/websocket_client_coro.cpp index 424697b8..d6a119ad 100644 --- a/example/websocket/client/coro/websocket_client_coro.cpp +++ b/example/websocket/client/coro/websocket_client_coro.cpp @@ -93,7 +93,7 @@ do_session( return fail(ec, "write"); // This buffer will hold the incoming message - beast::multi_buffer buffer; + beast::flat_buffer buffer; // Read a message into our buffer ws.async_read(buffer, yield[ec]); diff --git a/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp b/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp index 25cdff8e..cce21be9 100644 --- a/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp +++ b/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp @@ -89,7 +89,7 @@ int main(int argc, char** argv) ws.write(net::buffer(std::string(text))); // This buffer will hold the incoming message - beast::multi_buffer buffer; + beast::flat_buffer buffer; // Read a message into our buffer ws.read(buffer); diff --git a/example/websocket/client/sync/websocket_client_sync.cpp b/example/websocket/client/sync/websocket_client_sync.cpp index 2260be16..c80ae41b 100644 --- a/example/websocket/client/sync/websocket_client_sync.cpp +++ b/example/websocket/client/sync/websocket_client_sync.cpp @@ -76,7 +76,7 @@ int main(int argc, char** argv) ws.write(net::buffer(std::string(text))); // This buffer will hold the incoming message - beast::multi_buffer buffer; + beast::flat_buffer buffer; // Read a message into our buffer ws.read(buffer); 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 e45afd67..0678fde1 100644 --- a/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp +++ b/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp @@ -50,7 +50,7 @@ class session : public std::enable_shared_from_this { websocket::stream< beast::ssl_stream> ws_; - beast::multi_buffer buffer_; + beast::flat_buffer buffer_; public: // Take ownership of the socket diff --git a/example/websocket/server/async/websocket_server_async.cpp b/example/websocket/server/async/websocket_server_async.cpp index 39f47895..5663561c 100644 --- a/example/websocket/server/async/websocket_server_async.cpp +++ b/example/websocket/server/async/websocket_server_async.cpp @@ -44,7 +44,7 @@ fail(beast::error_code ec, char const* what) class session : public std::enable_shared_from_this { websocket::stream ws_; - beast::multi_buffer buffer_; + beast::flat_buffer buffer_; public: // Take ownership of the socket 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 cb9e08eb..c0374fce 100644 --- a/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp +++ b/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp @@ -88,7 +88,7 @@ do_session( for(;;) { // This buffer will hold the incoming message - beast::multi_buffer buffer; + beast::flat_buffer buffer; // Read a message ws.async_read(buffer, yield[ec]); diff --git a/example/websocket/server/coro/websocket_server_coro.cpp b/example/websocket/server/coro/websocket_server_coro.cpp index b1c875f8..5901742e 100644 --- a/example/websocket/server/coro/websocket_server_coro.cpp +++ b/example/websocket/server/coro/websocket_server_coro.cpp @@ -70,7 +70,7 @@ do_session( for(;;) { // This buffer will hold the incoming message - beast::multi_buffer buffer; + beast::flat_buffer buffer; // Read a message ws.async_read(buffer, yield[ec]); diff --git a/example/websocket/server/fast/websocket_server_fast.cpp b/example/websocket/server/fast/websocket_server_fast.cpp index ad4857ad..2e962137 100644 --- a/example/websocket/server/fast/websocket_server_fast.cpp +++ b/example/websocket/server/fast/websocket_server_fast.cpp @@ -99,7 +99,7 @@ do_sync_session(websocket::stream& ws) for(;;) { - beast::multi_buffer buffer; + beast::flat_buffer buffer; ws.read(buffer, ec); if(ec == websocket::error::closed) @@ -141,7 +141,7 @@ do_sync_listen( class async_session : public std::enable_shared_from_this { websocket::stream ws_; - beast::multi_buffer buffer_; + beast::flat_buffer buffer_; public: // Take ownership of the socket @@ -355,7 +355,7 @@ do_coro_session( for(;;) { - beast::multi_buffer buffer; + beast::flat_buffer buffer; ws.async_read(buffer, yield[ec]); if(ec == websocket::error::closed) 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 5f5c840c..b8786dfe 100644 --- a/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp +++ b/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp @@ -52,7 +52,7 @@ class session , public std::enable_shared_from_this { websocket::stream> ws_; - beast::multi_buffer buffer_; + beast::flat_buffer buffer_; public: // Take ownership of the socket diff --git a/example/websocket/server/stackless/websocket_server_stackless.cpp b/example/websocket/server/stackless/websocket_server_stackless.cpp index 5d3e5e0b..324b1097 100644 --- a/example/websocket/server/stackless/websocket_server_stackless.cpp +++ b/example/websocket/server/stackless/websocket_server_stackless.cpp @@ -47,7 +47,7 @@ class session , public std::enable_shared_from_this { websocket::stream ws_; - beast::multi_buffer buffer_; + beast::flat_buffer buffer_; public: // Take ownership of the socket diff --git a/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp b/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp index dc11a5f4..1795a666 100644 --- a/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp +++ b/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp @@ -63,7 +63,7 @@ do_session(tcp::socket& socket, ssl::context& ctx) for(;;) { // This buffer will hold the incoming message - beast::multi_buffer buffer; + beast::flat_buffer buffer; // Read a message ws.read(buffer); diff --git a/example/websocket/server/sync/websocket_server_sync.cpp b/example/websocket/server/sync/websocket_server_sync.cpp index 0872d01f..2f75c468 100644 --- a/example/websocket/server/sync/websocket_server_sync.cpp +++ b/example/websocket/server/sync/websocket_server_sync.cpp @@ -54,7 +54,7 @@ do_session(tcp::socket& socket) for(;;) { // This buffer will hold the incoming message - beast::multi_buffer buffer; + beast::flat_buffer buffer; // Read a message ws.read(buffer); diff --git a/test/bench/wsload/wsload.cpp b/test/bench/wsload/wsload.cpp index 70cf9002..20da85b1 100644 --- a/test/bench/wsload/wsload.cpp +++ b/test/bench/wsload/wsload.cpp @@ -115,7 +115,7 @@ class connection test_buffer const& tb_; net::strand< net::io_context::executor_type> strand_; - beast::multi_buffer buffer_; + beast::flat_buffer buffer_; std::mt19937_64 rng_; std::size_t count_ = 0; std::size_t bytes_ = 0;