commit 81242906a5b7dd169667a3a07552d775a7e8662d
author Christopher Kohlhoff <chris@kohlhoff.com> Mon Feb 16 07:54:12 2015 +1100
committer Christopher Kohlhoff <chris@kohlhoff.com> Mon Feb 16 07:54:40 2015 +1100
tree b66f81d5a05748cd54b0a6e280c4896f563aef8e
parent 4a19f23564d844adb55c4f1c24dc0ff51b181949

Allow nested calls to completion handler when using yield_context.

asio/include/asio/impl/spawn.hpp

diff --git a/asio/include/asio/impl/spawn.hpp b/asio/include/asio/impl/spawn.hpp
index 036b66f..2efc1f9 100644
--- a/asio/include/asio/impl/spawn.hpp
+++ b/asio/include/asio/impl/spawn.hpp
@@ -19,6 +19,7 @@
 #include "asio/associated_allocator.hpp"
 #include "asio/associated_executor.hpp"
 #include "asio/async_result.hpp"
+#include "asio/detail/atomic_count.hpp"
 #include "asio/detail/handler_alloc_helpers.hpp"
 #include "asio/detail/handler_cont_helpers.hpp"
 #include "asio/detail/handler_invoke_helpers.hpp"
@@ -41,6 +42,7 @@
       : coro_(ctx.coro_.lock()),
         ca_(ctx.ca_),
         handler_(ctx.handler_),
+        ready_(0),
         ec_(ctx.ec_),
         value_(0)
     {
@@ -50,20 +52,23 @@
     {
       *ec_ = asio::error_code();
       *value_ = ASIO_MOVE_CAST(T)(value);
-      (*coro_)();
+      if (--*ready_ == 0)
+        (*coro_)();
     }
 
     void operator()(asio::error_code ec, T value)
     {
       *ec_ = ec;
       *value_ = ASIO_MOVE_CAST(T)(value);
-      (*coro_)();
+      if (--*ready_ == 0)
+        (*coro_)();
     }
 
   //private:
     shared_ptr<typename basic_yield_context<Handler>::callee_type> coro_;
     typename basic_yield_context<Handler>::caller_type& ca_;
     Handler handler_;
+    atomic_count* ready_;
     asio::error_code* ec_;
     T* value_;
   };
@@ -76,6 +81,7 @@
       : coro_(ctx.coro_.lock()),
         ca_(ctx.ca_),
         handler_(ctx.handler_),
+        ready_(0),
         ec_(ctx.ec_)
     {
     }
@@ -83,19 +89,22 @@
     void operator()()
     {
       *ec_ = asio::error_code();
-      (*coro_)();
+      if (--*ready_ == 0)
+        (*coro_)();
     }
 
     void operator()(asio::error_code ec)
     {
       *ec_ = ec;
-      (*coro_)();
+      if (--*ready_ == 0)
+        (*coro_)();
     }
 
   //private:
     shared_ptr<typename basic_yield_context<Handler>::callee_type> coro_;
     typename basic_yield_context<Handler>::caller_type& ca_;
     Handler handler_;
+    atomic_count* ready_;
     asio::error_code* ec_;
   };
 
@@ -175,8 +184,10 @@
 
   explicit async_result(detail::coro_handler<Handler, T>& h)
     : handler_(h),
-      ca_(h.ca_)
+      ca_(h.ca_),
+      ready_(2)
   {
+    h.ready_ = &ready_;
     out_ec_ = h.ec_;
     if (!out_ec_) h.ec_ = &ec_;
     h.value_ = &value_;
@@ -185,7 +196,8 @@
   type get()
   {
     handler_.coro_.reset(); // Must not hold shared_ptr to coro while suspended.
-    ca_();
+    if (--ready_ != 0)
+      ca_();
     if (!out_ec_ && ec_) throw asio::system_error(ec_);
     return ASIO_MOVE_CAST(type)(value_);
   }
@@ -193,6 +205,7 @@
 private:
   detail::coro_handler<Handler, T>& handler_;
   typename basic_yield_context<Handler>::caller_type& ca_;
+  detail::atomic_count ready_;
   asio::error_code* out_ec_;
   asio::error_code ec_;
   type value_;
@@ -206,8 +219,10 @@
 
   explicit async_result(detail::coro_handler<Handler, void>& h)
     : handler_(h),
-      ca_(h.ca_)
+      ca_(h.ca_),
+      ready_(2)
   {
+    h.ready_ = &ready_;
     out_ec_ = h.ec_;
     if (!out_ec_) h.ec_ = &ec_;
   }
@@ -215,13 +230,15 @@
   void get()
   {
     handler_.coro_.reset(); // Must not hold shared_ptr to coro while suspended.
-    ca_();
+    if (--ready_ != 0)
+      ca_();
     if (!out_ec_ && ec_) throw asio::system_error(ec_);
   }
 
 private:
   detail::coro_handler<Handler, void>& handler_;
   typename basic_yield_context<Handler>::caller_type& ca_;
+  detail::atomic_count ready_;
   asio::error_code* out_ec_;
   asio::error_code ec_;
 };

asio/include/asio/version.hpp

diff --git a/asio/include/asio/version.hpp b/asio/include/asio/version.hpp
index 9a32f59..9def83c 100644
--- a/asio/include/asio/version.hpp
+++ b/asio/include/asio/version.hpp
@@ -18,6 +18,6 @@
 // ASIO_VERSION % 100 is the sub-minor version
 // ASIO_VERSION / 100 % 1000 is the minor version
 // ASIO_VERSION / 100000 is the major version
-#define ASIO_VERSION 101004 // 1.10.4
+#define ASIO_VERSION 101100 // 1.11.0
 
 #endif // ASIO_VERSION_HPP