diff options
Diffstat (limited to '3rdparty/asio/include/asio/detail/win_iocp_null_buffers_op.hpp')
-rw-r--r-- | 3rdparty/asio/include/asio/detail/win_iocp_null_buffers_op.hpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/3rdparty/asio/include/asio/detail/win_iocp_null_buffers_op.hpp b/3rdparty/asio/include/asio/detail/win_iocp_null_buffers_op.hpp index f9e296debc1..07751b9234b 100644 --- a/3rdparty/asio/include/asio/detail/win_iocp_null_buffers_op.hpp +++ b/3rdparty/asio/include/asio/detail/win_iocp_null_buffers_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_null_buffers_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -20,10 +20,9 @@ #if defined(ASIO_HAS_IOCP) #include "asio/detail/bind_handler.hpp" -#include "asio/detail/buffer_sequence_adapter.hpp" #include "asio/detail/fenced_block.hpp" #include "asio/detail/handler_alloc_helpers.hpp" -#include "asio/detail/handler_invoke_helpers.hpp" +#include "asio/detail/handler_work.hpp" #include "asio/detail/memory.hpp" #include "asio/detail/reactor_op.hpp" #include "asio/detail/socket_ops.hpp" @@ -34,20 +33,21 @@ namespace asio { namespace detail { -template <typename Handler> +template <typename Handler, typename IoExecutor> class win_iocp_null_buffers_op : public reactor_op { public: ASIO_DEFINE_HANDLER_PTR(win_iocp_null_buffers_op); win_iocp_null_buffers_op(socket_ops::weak_cancel_token_type cancel_token, - Handler& handler) - : reactor_op(&win_iocp_null_buffers_op::do_perform, + Handler& handler, const IoExecutor& io_ex) + : reactor_op(asio::error_code(), + &win_iocp_null_buffers_op::do_perform, &win_iocp_null_buffers_op::do_complete), cancel_token_(cancel_token), - handler_(ASIO_MOVE_CAST(Handler)(handler)) + handler_(static_cast<Handler&&>(handler)), + work_(handler_, io_ex) { - handler_work<Handler>::start(handler_); } static status do_perform(reactor_op*) @@ -62,12 +62,17 @@ public: asio::error_code ec(result_ec); // Take ownership of the operation object. + ASIO_ASSUME(base != 0); win_iocp_null_buffers_op* o(static_cast<win_iocp_null_buffers_op*>(base)); ptr p = { asio::detail::addressof(o->handler_), o, o }; - handler_work<Handler> w(o->handler_); ASIO_HANDLER_COMPLETION((*o)); + // Take ownership of the operation's outstanding work. + handler_work<Handler, IoExecutor> w( + static_cast<handler_work<Handler, IoExecutor>&&>( + o->work_)); + // The reactor may have stored a result in the operation object. if (o->ec_) ec = o->ec_; @@ -85,6 +90,8 @@ public: ec = asio::error::connection_refused; } + ASIO_ERROR_LOCATION(ec); + // Make a copy of the handler so that the memory can be deallocated before // the upcall is made. Even if we're not about to make an upcall, a // sub-object of the handler may be the true owner of the memory associated @@ -109,6 +116,7 @@ public: private: socket_ops::weak_cancel_token_type cancel_token_; Handler handler_; + handler_work<Handler, IoExecutor> work_; }; } // namespace detail |