aboutsummaryrefslogtreecommitdiff
path: root/src/zenhttp/transports/asiotransport.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2026-03-12 15:05:04 +0100
committerGitHub Enterprise <[email protected]>2026-03-12 15:05:04 +0100
commit81c87586690ef596561e257e1ddde274848199fd (patch)
tree07a2edf8b0e2033603bd805f7d9ac192502e27f7 /src/zenhttp/transports/asiotransport.cpp
parentTransparent proxy mode (#823) (diff)
downloadzen-81c87586690ef596561e257e1ddde274848199fd.tar.xz
zen-81c87586690ef596561e257e1ddde274848199fd.zip
upgrade asio from 1.29.0 to 1.38.0 (#827)
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)
Diffstat (limited to 'src/zenhttp/transports/asiotransport.cpp')
-rw-r--r--src/zenhttp/transports/asiotransport.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/zenhttp/transports/asiotransport.cpp b/src/zenhttp/transports/asiotransport.cpp
index 23ac1bc8b..d5413b9af 100644
--- a/src/zenhttp/transports/asiotransport.cpp
+++ b/src/zenhttp/transports/asiotransport.cpp
@@ -47,10 +47,10 @@ private:
uint16_t m_BasePort = 8558;
int m_ThreadCount = 0;
- asio::io_service m_IoService;
- asio::io_service::work m_Work{m_IoService};
- std::unique_ptr<AsioTransportAcceptor> m_Acceptor;
- std::vector<std::thread> m_ThreadPool;
+ asio::io_context m_IoService;
+ asio::executor_work_guard<asio::io_context::executor_type> m_Work{m_IoService.get_executor()};
+ std::unique_ptr<AsioTransportAcceptor> m_Acceptor;
+ std::vector<std::thread> m_ThreadPool;
};
struct AsioTransportConnection : public TransportConnection, std::enable_shared_from_this<AsioTransportConnection>
@@ -85,7 +85,7 @@ private:
struct AsioTransportAcceptor
{
- AsioTransportAcceptor(TransportServer* ServerInterface, asio::io_service& IoService, uint16_t BasePort);
+ AsioTransportAcceptor(TransportServer* ServerInterface, asio::io_context& IoService, uint16_t BasePort);
~AsioTransportAcceptor();
void Start();
@@ -95,7 +95,7 @@ struct AsioTransportAcceptor
private:
TransportServer* m_ServerInterface = nullptr;
- asio::io_service& m_IoService;
+ asio::io_context& m_IoService;
asio::ip::tcp::acceptor m_Acceptor;
std::atomic<bool> m_IsStopped{false};
@@ -104,7 +104,7 @@ private:
//////////////////////////////////////////////////////////////////////////
-AsioTransportAcceptor::AsioTransportAcceptor(TransportServer* ServerInterface, asio::io_service& IoService, uint16_t BasePort)
+AsioTransportAcceptor::AsioTransportAcceptor(TransportServer* ServerInterface, asio::io_context& IoService, uint16_t BasePort)
: m_ServerInterface(ServerInterface)
, m_IoService(IoService)
, m_Acceptor(m_IoService, asio::ip::tcp::v6())