diff options
Diffstat (limited to '3rdparty/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp')
-rw-r--r-- | 3rdparty/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/3rdparty/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp b/3rdparty/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp index 9e5952f6ce6..85e4b78dc20 100644 --- a/3rdparty/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp +++ b/3rdparty/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp @@ -1,8 +1,8 @@ // // detail/win_iocp_socket_recvmsg_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" @@ -35,7 +35,7 @@ namespace asio { namespace detail { -template <typename MutableBufferSequence, typename Handler> +template <typename MutableBufferSequence, typename Handler, typename IoExecutor> class win_iocp_socket_recvmsg_op : public operation { public: @@ -44,14 +44,15 @@ public: win_iocp_socket_recvmsg_op( socket_ops::weak_cancel_token_type cancel_token, const MutableBufferSequence& buffers, - socket_base::message_flags& out_flags, Handler& handler) + socket_base::message_flags& out_flags, + Handler& handler, const IoExecutor& io_ex) : operation(&win_iocp_socket_recvmsg_op::do_complete), cancel_token_(cancel_token), buffers_(buffers), out_flags_(out_flags), - 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, @@ -61,13 +62,18 @@ public: asio::error_code ec(result_ec); // Take ownership of the operation object. + ASIO_ASSUME(base != 0); win_iocp_socket_recvmsg_op* o( static_cast<win_iocp_socket_recvmsg_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) @@ -80,6 +86,8 @@ public: socket_ops::complete_iocp_recvmsg(o->cancel_token_, ec); o->out_flags_ = 0; + 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 @@ -106,6 +114,7 @@ private: MutableBufferSequence buffers_; socket_base::message_flags& out_flags_; Handler handler_; + handler_work<Handler, IoExecutor> work_; }; } // namespace detail |