diff options
Diffstat (limited to '3rdparty/asio/include/asio/detail/win_iocp_socket_recv_op.hpp')
-rw-r--r-- | 3rdparty/asio/include/asio/detail/win_iocp_socket_recv_op.hpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/3rdparty/asio/include/asio/detail/win_iocp_socket_recv_op.hpp b/3rdparty/asio/include/asio/detail/win_iocp_socket_recv_op.hpp index 98b000548d9..874a12aa7d0 100644 --- a/3rdparty/asio/include/asio/detail/win_iocp_socket_recv_op.hpp +++ b/3rdparty/asio/include/asio/detail/win_iocp_socket_recv_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_socket_recv_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) @@ -23,7 +23,7 @@ #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/operation.hpp" #include "asio/detail/socket_ops.hpp" @@ -34,7 +34,7 @@ namespace asio { namespace detail { -template <typename MutableBufferSequence, typename Handler> +template <typename MutableBufferSequence, typename Handler, typename IoExecutor> class win_iocp_socket_recv_op : public operation { public: @@ -42,14 +42,15 @@ public: win_iocp_socket_recv_op(socket_ops::state_type state, socket_ops::weak_cancel_token_type cancel_token, - const MutableBufferSequence& buffers, Handler& handler) + const MutableBufferSequence& buffers, Handler& handler, + const IoExecutor& io_ex) : operation(&win_iocp_socket_recv_op::do_complete), state_(state), cancel_token_(cancel_token), buffers_(buffers), - handler_(ASIO_MOVE_CAST(Handler)(handler)) + handler_(static_cast<Handler&&>(handler)), + work_(handler_, io_ex) { - handler_work<Handler>::start(handler_); } static void do_complete(void* owner, operation* base, @@ -59,12 +60,17 @@ public: asio::error_code ec(result_ec); // Take ownership of the operation object. + ASIO_ASSUME(base != 0); win_iocp_socket_recv_op* o(static_cast<win_iocp_socket_recv_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_)); + #if defined(ASIO_ENABLE_BUFFER_DEBUGGING) // Check whether buffers are still valid. if (owner) @@ -79,6 +85,8 @@ public: MutableBufferSequence>::all_empty(o->buffers_), ec, bytes_transferred); + 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 @@ -105,6 +113,7 @@ private: socket_ops::weak_cancel_token_type cancel_token_; MutableBufferSequence buffers_; Handler handler_; + handler_work<Handler, IoExecutor> work_; }; } // namespace detail |