diff options
Diffstat (limited to '3rdparty/asio/include/asio/detail/reactive_wait_op.hpp')
-rw-r--r-- | 3rdparty/asio/include/asio/detail/reactive_wait_op.hpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/3rdparty/asio/include/asio/detail/reactive_wait_op.hpp b/3rdparty/asio/include/asio/detail/reactive_wait_op.hpp index 99f8811cf9a..c7e2eb8d376 100644 --- a/3rdparty/asio/include/asio/detail/reactive_wait_op.hpp +++ b/3rdparty/asio/include/asio/detail/reactive_wait_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_wait_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 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) @@ -16,9 +16,11 @@ #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) #include "asio/detail/config.hpp" +#include "asio/detail/bind_handler.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" @@ -27,18 +29,19 @@ namespace asio { namespace detail { -template <typename Handler> +template <typename Handler, typename IoExecutor> class reactive_wait_op : public reactor_op { public: ASIO_DEFINE_HANDLER_PTR(reactive_wait_op); - reactive_wait_op(Handler& handler) - : reactor_op(&reactive_wait_op::do_perform, + reactive_wait_op(const asio::error_code& success_ec, + Handler& handler, const IoExecutor& io_ex) + : reactor_op(success_ec, &reactive_wait_op::do_perform, &reactive_wait_op::do_complete), - handler_(ASIO_MOVE_CAST(Handler)(handler)) + handler_(ASIO_MOVE_CAST(Handler)(handler)), + work_(handler_, io_ex) { - handler_work<Handler>::start(handler_); } static status do_perform(reactor_op*) @@ -53,10 +56,14 @@ public: // Take ownership of the handler object. reactive_wait_op* o(static_cast<reactive_wait_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( + ASIO_MOVE_CAST2(handler_work<Handler, IoExecutor>)( + o->work_)); + // 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 @@ -80,6 +87,7 @@ public: private: Handler handler_; + handler_work<Handler, IoExecutor> work_; }; } // namespace detail |