From 81c87586690ef596561e257e1ddde274848199fd Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Thu, 12 Mar 2026 15:05:04 +0100 Subject: upgrade asio from 1.29.0 to 1.38.0 (#827) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migrate removed deprecated APIs: - io_service -> io_context - io_service::work -> executor_work_guard - resolver::query/iterator -> resolver::resolve() with results_type - address::from_string() -> make_address() --- Breaking Changes (1.33.0) - deferred as default completion token — can omit token in coroutines: co_await socket.async_read_some(buf) - cancel_after / cancel_at — timeout any async operation: co_await sock.async_read_some(buf, cancel_after(5s)) - Partial completion token adapters — as_tuple, redirect_error, bind_executor etc. composable via pipe: co_await (async_write(sock, buf) | as_tuple | cancel_after(10s)) - composed — simpler alternative to async_compose for stateful operation implementations - co_composed moved out of experimental 1.35.0 — Allocator & Resolver - Allocator constructors for io_context and thread_pool — control memory allocation for services, I/O objects, strands - Configurable resolver thread pool ("resolver"/"threads") - Timer heap pre-allocation ("timer"/"heap_reserve") 1.37.0 — Inline Executors & Reactor Tuning - inline_executor — always executes inline (useful as completion executor) - inline_or_executor<> — tries inline first, falls back to wrapped executor - New dispatch/post/defer overloads that run a function on one executor and deliver result to a handler on another - redirect_disposition — captures disposition into a variable (like redirect_error but generic) - Reactor config: reset_edge_on_partial_read, use_eventfd, use_timerfd Notable Fixes - Resource leak in awaitable move assignment (1.37.0) - Memory leak in SSL stream move assignment (1.37.0) - Thread sanitizer issue in kqueue reactor (1.37.0) - co_spawn non-reentrant completion handler fix (1.36.0) - Windows file append mode fix (1.32.0) - SSL engine move assignment leak (1.33.0) --- src/zenhttp/clients/httpwsclient.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/zenhttp/clients/httpwsclient.cpp') diff --git a/src/zenhttp/clients/httpwsclient.cpp b/src/zenhttp/clients/httpwsclient.cpp index 792848a6b..2d566ae86 100644 --- a/src/zenhttp/clients/httpwsclient.cpp +++ b/src/zenhttp/clients/httpwsclient.cpp @@ -125,8 +125,8 @@ struct HttpWsClient::Impl { if (m_OwnedIoContext) { - m_WorkGuard = std::make_unique(m_IoContext); - m_IoThread = std::thread([this] { m_IoContext.run(); }); + m_WorkGuard.emplace(m_IoContext.get_executor()); + m_IoThread = std::thread([this] { m_IoContext.run(); }); } #if defined(ASIO_HAS_LOCAL_SOCKETS) @@ -564,10 +564,10 @@ struct HttpWsClient::Impl std::string m_Path; // io_context: owned (standalone) or external (shared) - std::unique_ptr m_OwnedIoContext; - asio::io_context& m_IoContext; - std::unique_ptr m_WorkGuard; - std::thread m_IoThread; + std::unique_ptr m_OwnedIoContext; + asio::io_context& m_IoContext; + std::optional> m_WorkGuard; + std::thread m_IoThread; // Connection state std::unique_ptr m_Resolver; -- cgit v1.2.3