couchbase 3.0.0.beta.1 → 3.1.0

data/ext/third_party/asio/asio/include/asio/detail/variadic_templates.hpp

@@ -31,6 +31,15 @@
   typename T1, typename T2, typename T3, typename T4
 # define ASIO_VARIADIC_TPARAMS_5 \
   typename T1, typename T2, typename T3, typename T4, typename T5
+# define ASIO_VARIADIC_TPARAMS_6 \
+  typename T1, typename T2, typename T3, typename T4, typename T5, \
+  typename T6
+# define ASIO_VARIADIC_TPARAMS_7 \
+  typename T1, typename T2, typename T3, typename T4, typename T5, \
+  typename T6, typename T7
+# define ASIO_VARIADIC_TPARAMS_8 \
+  typename T1, typename T2, typename T3, typename T4, typename T5, \
+  typename T6, typename T7, typename T8
 
 # define ASIO_VARIADIC_TARGS(n) ASIO_VARIADIC_TARGS_##n
 
@@ -39,6 +48,9 @@
 # define ASIO_VARIADIC_TARGS_3 T1, T2, T3
 # define ASIO_VARIADIC_TARGS_4 T1, T2, T3, T4
 # define ASIO_VARIADIC_TARGS_5 T1, T2, T3, T4, T5
+# define ASIO_VARIADIC_TARGS_6 T1, T2, T3, T4, T5, T6
+# define ASIO_VARIADIC_TARGS_7 T1, T2, T3, T4, T5, T6, T7
+# define ASIO_VARIADIC_TARGS_8 T1, T2, T3, T4, T5, T6, T7, T8
 
 # define ASIO_VARIADIC_BYVAL_PARAMS(n) \
   ASIO_VARIADIC_BYVAL_PARAMS_##n
@@ -48,6 +60,12 @@
 # define ASIO_VARIADIC_BYVAL_PARAMS_3 T1 x1, T2 x2, T3 x3
 # define ASIO_VARIADIC_BYVAL_PARAMS_4 T1 x1, T2 x2, T3 x3, T4 x4
 # define ASIO_VARIADIC_BYVAL_PARAMS_5 T1 x1, T2 x2, T3 x3, T4 x4, T5 x5
+# define ASIO_VARIADIC_BYVAL_PARAMS_6 T1 x1, T2 x2, T3 x3, T4 x4, T5 x5, \
+  T6 x6
+# define ASIO_VARIADIC_BYVAL_PARAMS_7 T1 x1, T2 x2, T3 x3, T4 x4, T5 x5, \
+  T6 x6, T7 x7
+# define ASIO_VARIADIC_BYVAL_PARAMS_8 T1 x1, T2 x2, T3 x3, T4 x4, T5 x5, \
+  T6 x6, T7 x7, T8 x8
 
 # define ASIO_VARIADIC_BYVAL_ARGS(n) \
   ASIO_VARIADIC_BYVAL_ARGS_##n
@@ -57,6 +75,9 @@
 # define ASIO_VARIADIC_BYVAL_ARGS_3 x1, x2, x3
 # define ASIO_VARIADIC_BYVAL_ARGS_4 x1, x2, x3, x4
 # define ASIO_VARIADIC_BYVAL_ARGS_5 x1, x2, x3, x4, x5
+# define ASIO_VARIADIC_BYVAL_ARGS_6 x1, x2, x3, x4, x5, x6
+# define ASIO_VARIADIC_BYVAL_ARGS_7 x1, x2, x3, x4, x5, x6, x7
+# define ASIO_VARIADIC_BYVAL_ARGS_8 x1, x2, x3, x4, x5, x6, x7, x8
 
 # define ASIO_VARIADIC_CONSTREF_PARAMS(n) \
   ASIO_VARIADIC_CONSTREF_PARAMS_##n
@@ -71,6 +92,15 @@
   const T1& x1, const T2& x2, const T3& x3, const T4& x4
 # define ASIO_VARIADIC_CONSTREF_PARAMS_5 \
   const T1& x1, const T2& x2, const T3& x3, const T4& x4, const T5& x5
+# define ASIO_VARIADIC_CONSTREF_PARAMS_6 \
+  const T1& x1, const T2& x2, const T3& x3, const T4& x4, const T5& x5, \
+  const T6& x6
+# define ASIO_VARIADIC_CONSTREF_PARAMS_7 \
+  const T1& x1, const T2& x2, const T3& x3, const T4& x4, const T5& x5, \
+  const T6& x6, const T7& x7
+# define ASIO_VARIADIC_CONSTREF_PARAMS_8 \
+  const T1& x1, const T2& x2, const T3& x3, const T4& x4, const T5& x5, \
+  const T6& x6, const T7& x7, const T8& x8
 
 # define ASIO_VARIADIC_MOVE_PARAMS(n) \
   ASIO_VARIADIC_MOVE_PARAMS_##n
@@ -89,6 +119,52 @@
   ASIO_MOVE_ARG(T1) x1, ASIO_MOVE_ARG(T2) x2, \
   ASIO_MOVE_ARG(T3) x3, ASIO_MOVE_ARG(T4) x4, \
   ASIO_MOVE_ARG(T5) x5
+# define ASIO_VARIADIC_MOVE_PARAMS_6 \
+  ASIO_MOVE_ARG(T1) x1, ASIO_MOVE_ARG(T2) x2, \
+  ASIO_MOVE_ARG(T3) x3, ASIO_MOVE_ARG(T4) x4, \
+  ASIO_MOVE_ARG(T5) x5, ASIO_MOVE_ARG(T6) x6
+# define ASIO_VARIADIC_MOVE_PARAMS_7 \
+  ASIO_MOVE_ARG(T1) x1, ASIO_MOVE_ARG(T2) x2, \
+  ASIO_MOVE_ARG(T3) x3, ASIO_MOVE_ARG(T4) x4, \
+  ASIO_MOVE_ARG(T5) x5, ASIO_MOVE_ARG(T6) x6, \
+  ASIO_MOVE_ARG(T7) x7
+# define ASIO_VARIADIC_MOVE_PARAMS_8 \
+  ASIO_MOVE_ARG(T1) x1, ASIO_MOVE_ARG(T2) x2, \
+  ASIO_MOVE_ARG(T3) x3, ASIO_MOVE_ARG(T4) x4, \
+  ASIO_MOVE_ARG(T5) x5, ASIO_MOVE_ARG(T6) x6, \
+  ASIO_MOVE_ARG(T7) x7, ASIO_MOVE_ARG(T8) x8
+
+# define ASIO_VARIADIC_UNNAMED_MOVE_PARAMS(n) \
+  ASIO_VARIADIC_UNNAMED_MOVE_PARAMS_##n
+
+# define ASIO_VARIADIC_UNNAMED_MOVE_PARAMS_1 \
+  ASIO_MOVE_ARG(T1)
+# define ASIO_VARIADIC_UNNAMED_MOVE_PARAMS_2 \
+  ASIO_MOVE_ARG(T1), ASIO_MOVE_ARG(T2)
+# define ASIO_VARIADIC_UNNAMED_MOVE_PARAMS_3 \
+  ASIO_MOVE_ARG(T1), ASIO_MOVE_ARG(T2), \
+  ASIO_MOVE_ARG(T3)
+# define ASIO_VARIADIC_UNNAMED_MOVE_PARAMS_4 \
+  ASIO_MOVE_ARG(T1), ASIO_MOVE_ARG(T2), \
+  ASIO_MOVE_ARG(T3), ASIO_MOVE_ARG(T4)
+# define ASIO_VARIADIC_UNNAMED_MOVE_PARAMS_5 \
+  ASIO_MOVE_ARG(T1), ASIO_MOVE_ARG(T2), \
+  ASIO_MOVE_ARG(T3), ASIO_MOVE_ARG(T4), \
+  ASIO_MOVE_ARG(T5)
+# define ASIO_VARIADIC_UNNAMED_MOVE_PARAMS_6 \
+  ASIO_MOVE_ARG(T1), ASIO_MOVE_ARG(T2), \
+  ASIO_MOVE_ARG(T3), ASIO_MOVE_ARG(T4), \
+  ASIO_MOVE_ARG(T5), ASIO_MOVE_ARG(T6)
+# define ASIO_VARIADIC_UNNAMED_MOVE_PARAMS_7 \
+  ASIO_MOVE_ARG(T1), ASIO_MOVE_ARG(T2), \
+  ASIO_MOVE_ARG(T3), ASIO_MOVE_ARG(T4), \
+  ASIO_MOVE_ARG(T5), ASIO_MOVE_ARG(T6), \
+  ASIO_MOVE_ARG(T7)
+# define ASIO_VARIADIC_UNNAMED_MOVE_PARAMS_8 \
+  ASIO_MOVE_ARG(T1), ASIO_MOVE_ARG(T2), \
+  ASIO_MOVE_ARG(T3), ASIO_MOVE_ARG(T4), \
+  ASIO_MOVE_ARG(T5), ASIO_MOVE_ARG(T6), \
+  ASIO_MOVE_ARG(T7), ASIO_MOVE_ARG(T8)
 
 # define ASIO_VARIADIC_MOVE_ARGS(n) \
   ASIO_VARIADIC_MOVE_ARGS_##n
@@ -107,6 +183,44 @@
   ASIO_MOVE_CAST(T1)(x1), ASIO_MOVE_CAST(T2)(x2), \
   ASIO_MOVE_CAST(T3)(x3), ASIO_MOVE_CAST(T4)(x4), \
   ASIO_MOVE_CAST(T5)(x5)
+# define ASIO_VARIADIC_MOVE_ARGS_6 \
+  ASIO_MOVE_CAST(T1)(x1), ASIO_MOVE_CAST(T2)(x2), \
+  ASIO_MOVE_CAST(T3)(x3), ASIO_MOVE_CAST(T4)(x4), \
+  ASIO_MOVE_CAST(T5)(x5), ASIO_MOVE_CAST(T6)(x6)
+# define ASIO_VARIADIC_MOVE_ARGS_7 \
+  ASIO_MOVE_CAST(T1)(x1), ASIO_MOVE_CAST(T2)(x2), \
+  ASIO_MOVE_CAST(T3)(x3), ASIO_MOVE_CAST(T4)(x4), \
+  ASIO_MOVE_CAST(T5)(x5), ASIO_MOVE_CAST(T6)(x6), \
+  ASIO_MOVE_CAST(T7)(x7)
+# define ASIO_VARIADIC_MOVE_ARGS_8 \
+  ASIO_MOVE_CAST(T1)(x1), ASIO_MOVE_CAST(T2)(x2), \
+  ASIO_MOVE_CAST(T3)(x3), ASIO_MOVE_CAST(T4)(x4), \
+  ASIO_MOVE_CAST(T5)(x5), ASIO_MOVE_CAST(T6)(x6), \
+  ASIO_MOVE_CAST(T7)(x7), ASIO_MOVE_CAST(T8)(x8)
+
+# define ASIO_VARIADIC_DECLVAL(n) \
+  ASIO_VARIADIC_DECLVAL_##n
+
+# define ASIO_VARIADIC_DECLVAL_1 \
+  declval<T1>()
+# define ASIO_VARIADIC_DECLVAL_2 \
+  declval<T1>(), declval<T2>()
+# define ASIO_VARIADIC_DECLVAL_3 \
+  declval<T1>(), declval<T2>(), declval<T3>()
+# define ASIO_VARIADIC_DECLVAL_4 \
+  declval<T1>(), declval<T2>(), declval<T3>(), declval<T4>()
+# define ASIO_VARIADIC_DECLVAL_5 \
+  declval<T1>(), declval<T2>(), declval<T3>(), declval<T4>(), \
+  declval<T5>()
+# define ASIO_VARIADIC_DECLVAL_6 \
+  declval<T1>(), declval<T2>(), declval<T3>(), declval<T4>(), \
+  declval<T5>(), declval<T6>()
+# define ASIO_VARIADIC_DECLVAL_7 \
+  declval<T1>(), declval<T2>(), declval<T3>(), declval<T4>(), \
+  declval<T5>(), declval<T6>(), declval<T7>()
+# define ASIO_VARIADIC_DECLVAL_8 \
+  declval<T1>(), declval<T2>(), declval<T3>(), declval<T4>(), \
+  declval<T5>(), declval<T6>(), declval<T7>(), declval<T8>()
 
 # define ASIO_VARIADIC_MOVE_DECLVAL(n) \
   ASIO_VARIADIC_MOVE_DECLVAL_##n
@@ -125,6 +239,20 @@
   declval<ASIO_MOVE_ARG(T1)>(), declval<ASIO_MOVE_ARG(T2)>(), \
   declval<ASIO_MOVE_ARG(T3)>(), declval<ASIO_MOVE_ARG(T4)>(), \
   declval<ASIO_MOVE_ARG(T5)>()
+# define ASIO_VARIADIC_MOVE_DECLVAL_6 \
+  declval<ASIO_MOVE_ARG(T1)>(), declval<ASIO_MOVE_ARG(T2)>(), \
+  declval<ASIO_MOVE_ARG(T3)>(), declval<ASIO_MOVE_ARG(T4)>(), \
+  declval<ASIO_MOVE_ARG(T5)>(), declval<ASIO_MOVE_ARG(T6)>()
+# define ASIO_VARIADIC_MOVE_DECLVAL_7 \
+  declval<ASIO_MOVE_ARG(T1)>(), declval<ASIO_MOVE_ARG(T2)>(), \
+  declval<ASIO_MOVE_ARG(T3)>(), declval<ASIO_MOVE_ARG(T4)>(), \
+  declval<ASIO_MOVE_ARG(T5)>(), declval<ASIO_MOVE_ARG(T6)>(), \
+  declval<ASIO_MOVE_ARG(T7)>()
+# define ASIO_VARIADIC_MOVE_DECLVAL_8 \
+  declval<ASIO_MOVE_ARG(T1)>(), declval<ASIO_MOVE_ARG(T2)>(), \
+  declval<ASIO_MOVE_ARG(T3)>(), declval<ASIO_MOVE_ARG(T4)>(), \
+  declval<ASIO_MOVE_ARG(T5)>(), declval<ASIO_MOVE_ARG(T6)>(), \
+  declval<ASIO_MOVE_ARG(T7)>(), declval<ASIO_MOVE_ARG(T8)>()
 
 # define ASIO_VARIADIC_DECAY(n) \
   ASIO_VARIADIC_DECAY_##n
@@ -143,8 +271,23 @@
   typename decay<T1>::type, typename decay<T2>::type, \
   typename decay<T3>::type, typename decay<T4>::type, \
   typename decay<T5>::type
+# define ASIO_VARIADIC_DECAY_6 \
+  typename decay<T1>::type, typename decay<T2>::type, \
+  typename decay<T3>::type, typename decay<T4>::type, \
+  typename decay<T5>::type, typename decay<T6>::type
+# define ASIO_VARIADIC_DECAY_7 \
+  typename decay<T1>::type, typename decay<T2>::type, \
+  typename decay<T3>::type, typename decay<T4>::type, \
+  typename decay<T5>::type, typename decay<T6>::type, \
+  typename decay<T7>::type
+# define ASIO_VARIADIC_DECAY_8 \
+  typename decay<T1>::type, typename decay<T2>::type, \
+  typename decay<T3>::type, typename decay<T4>::type, \
+  typename decay<T5>::type, typename decay<T6>::type, \
+  typename decay<T7>::type, typename decay<T8>::type
 
-# define ASIO_VARIADIC_GENERATE(m) m(1) m(2) m(3) m(4) m(5)
+# define ASIO_VARIADIC_GENERATE(m) m(1) m(2) m(3) m(4) m(5) m(6) m(7) m(8)
+# define ASIO_VARIADIC_GENERATE_5(m) m(1) m(2) m(3) m(4) m(5)
 
 #endif // !defined(ASIO_HAS_VARIADIC_TEMPLATES)
 

data/ext/third_party/asio/asio/include/asio/detail/wait_handler.hpp

@@ -16,9 +16,9 @@
 #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/wait_op.hpp"
@@ -34,12 +34,11 @@ class wait_handler : public wait_op
 public:
   ASIO_DEFINE_HANDLER_PTR(wait_handler);
 
-  wait_handler(Handler& h, const IoExecutor& ex)
+  wait_handler(Handler& h, const IoExecutor& io_ex)
     : wait_op(&wait_handler::do_complete),
       handler_(ASIO_MOVE_CAST(Handler)(h)),
-      io_executor_(ex)
+      work_(handler_, io_ex)
   {
-    handler_work<Handler, IoExecutor>::start(handler_, io_executor_);
   }
 
   static void do_complete(void* owner, operation* base,
@@ -49,10 +48,14 @@ public:
     // Take ownership of the handler object.
     wait_handler* h(static_cast<wait_handler*>(base));
     ptr p = { asio::detail::addressof(h->handler_), h, h };
-    handler_work<Handler, IoExecutor> w(h->handler_, h->io_executor_);
 
     ASIO_HANDLER_COMPLETION((*h));
 
+    // Take ownership of the operation's outstanding work.
+    handler_work<Handler, IoExecutor> w(
+        ASIO_MOVE_CAST2(handler_work<Handler, IoExecutor>)(
+          h->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
@@ -76,7 +79,7 @@ public:
 
 private:
   Handler handler_;
-  IoExecutor io_executor_;
+  handler_work<Handler, IoExecutor> work_;
 };
 
 } // namespace detail

data/ext/third_party/asio/asio/include/asio/detail/win_event.hpp

@@ -19,6 +19,7 @@
 
 #if defined(ASIO_WINDOWS)
 
+#include <cstddef>
 #include "asio/detail/assert.hpp"
 #include "asio/detail/noncopyable.hpp"
 #include "asio/detail/socket_types.hpp"
@@ -67,6 +68,18 @@ public:
       ::SetEvent(events_[1]);
   }
 
+  // Unlock the mutex and signal one waiter who may destroy us.
+  template <typename Lock>
+  void unlock_and_signal_one_for_destruction(Lock& lock)
+  {
+    ASIO_ASSERT(lock.locked());
+    state_ |= 1;
+    bool have_waiters = (state_ > 1);
+    if (have_waiters)
+      ::SetEvent(events_[1]);
+    lock.unlock();
+  }
+
   // If there's a waiter, unlock the mutex and signal it.
   template <typename Lock>
   bool maybe_unlock_and_signal_one(Lock& lock)

data/ext/third_party/asio/asio/include/asio/detail/win_iocp_handle_read_op.hpp

@@ -20,14 +20,15 @@
 
 #if defined(ASIO_HAS_IOCP)
 
-#include "asio/error.hpp"
 #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/operation.hpp"
+#include "asio/error.hpp"
 
 #include "asio/detail/push_options.hpp"
 
@@ -45,9 +46,8 @@ public:
     : operation(&win_iocp_handle_read_op::do_complete),
       buffers_(buffers),
       handler_(ASIO_MOVE_CAST(Handler)(handler)),
-      io_executor_(io_ex)
+      work_(handler_, io_ex)
   {
-    handler_work<Handler, IoExecutor>::start(handler_, io_executor_);
   }
 
   static void do_complete(void* owner, operation* base,
@@ -59,10 +59,14 @@ public:
     // Take ownership of the operation object.
     win_iocp_handle_read_op* o(static_cast<win_iocp_handle_read_op*>(base));
     ptr p = { asio::detail::addressof(o->handler_), o, o };
-    handler_work<Handler, IoExecutor> w(o->handler_, o->io_executor_);
 
     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_));
+
 #if defined(ASIO_ENABLE_BUFFER_DEBUGGING)
     if (owner)
     {
@@ -100,7 +104,7 @@ public:
 private:
   MutableBufferSequence buffers_;
   Handler handler_;
-  IoExecutor io_executor_;
+  handler_work<Handler, IoExecutor> work_;
 };
 
 } // namespace detail

data/ext/third_party/asio/asio/include/asio/detail/win_iocp_handle_write_op.hpp

@@ -20,14 +20,15 @@
 
 #if defined(ASIO_HAS_IOCP)
 
-#include "asio/error.hpp"
 #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/operation.hpp"
+#include "asio/error.hpp"
 
 #include "asio/detail/push_options.hpp"
 
@@ -45,9 +46,8 @@ public:
     : operation(&win_iocp_handle_write_op::do_complete),
       buffers_(buffers),
       handler_(ASIO_MOVE_CAST(Handler)(handler)),
-      io_executor_(io_ex)
+      work_(handler_, io_ex)
   {
-    handler_work<Handler, IoExecutor>::start(handler_, io_executor_);
   }
 
   static void do_complete(void* owner, operation* base,
@@ -56,10 +56,14 @@ public:
     // Take ownership of the operation object.
     win_iocp_handle_write_op* o(static_cast<win_iocp_handle_write_op*>(base));
     ptr p = { asio::detail::addressof(o->handler_), o, o };
-    handler_work<Handler, IoExecutor> w(o->handler_, o->io_executor_);
 
     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_));
+
 #if defined(ASIO_ENABLE_BUFFER_DEBUGGING)
     if (owner)
     {
@@ -93,7 +97,7 @@ public:
 private:
   ConstBufferSequence buffers_;
   Handler handler_;
-  IoExecutor io_executor_;
+  handler_work<Handler, IoExecutor> work_;
 };
 
 } // namespace detail

data/ext/third_party/asio/asio/include/asio/detail/win_iocp_io_context.hpp

@@ -114,6 +114,9 @@ public:
     return thread_call_stack::contains(this) != 0;
   }
 
+  /// Capture the current exception so it can be rethrown from a run function.
+  ASIO_DECL void capture_current_exception();
+
   // Request invocation of the given operation and return immediately. Assumes
   // that work_started() has not yet been called for the operation.
   void post_immediate_completion(win_iocp_operation* op, bool)
@@ -221,7 +224,8 @@ private:
   // Dequeues at most one operation from the I/O completion port, and then
   // executes it. Returns the number of operations that were dequeued (i.e.
   // either 0 or 1).
-  ASIO_DECL size_t do_one(DWORD msec, asio::error_code& ec);
+  ASIO_DECL size_t do_one(DWORD msec,
+      win_iocp_thread_info& this_thread, asio::error_code& ec);
 
   // Helper to calculate the GetQueuedCompletionStatus timeout.
   ASIO_DECL static DWORD get_gqcs_timeout();

data/ext/third_party/asio/asio/include/asio/detail/win_iocp_null_buffers_op.hpp

@@ -20,10 +20,10 @@
 #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"
@@ -42,13 +42,13 @@ public:
 
   win_iocp_null_buffers_op(socket_ops::weak_cancel_token_type cancel_token,
       Handler& handler, const IoExecutor& io_ex)
-    : reactor_op(&win_iocp_null_buffers_op::do_perform,
+    : 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)),
-      io_executor_(io_ex)
+      work_(handler_, io_ex)
   {
-    handler_work<Handler, IoExecutor>::start(handler_, io_executor_);
   }
 
   static status do_perform(reactor_op*)
@@ -65,10 +65,14 @@ public:
     // Take ownership of the operation object.
     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, IoExecutor> w(o->handler_, o->io_executor_);
 
     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_));
+
     // The reactor may have stored a result in the operation object.
     if (o->ec_)
       ec = o->ec_;
@@ -110,7 +114,7 @@ public:
 private:
   socket_ops::weak_cancel_token_type cancel_token_;
   Handler handler_;
-  IoExecutor io_executor_;
+  handler_work<Handler, IoExecutor> work_;
 };
 
 } // namespace detail