Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/thread/future.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/thread/future.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/thread/future.hpp | 4129 |
1 files changed, 3549 insertions, 580 deletions
diff --git a/3rdParty/Boost/src/boost/thread/future.hpp b/3rdParty/Boost/src/boost/thread/future.hpp index 6bf5cf6..5f55707 100644 --- a/3rdParty/Boost/src/boost/thread/future.hpp +++ b/3rdParty/Boost/src/boost/thread/future.hpp @@ -1,5 +1,5 @@ // (C) Copyright 2008-10 Anthony Williams -// (C) Copyright 2011-2012 Vicente J. Botet Escriba +// (C) Copyright 2011-2014 Vicente J. Botet Escriba // // Distributed under the Boost Software License, Version 1.0. (See // accompanying file LICENSE_1_0.txt or copy at @@ -15,42 +15,58 @@ #ifndef BOOST_NO_EXCEPTIONS -#include <boost/detail/scoped_enum_emulation.hpp> +#include <boost/core/scoped_enum.hpp> #include <stdexcept> +#include <boost/thread/exceptional_ptr.hpp> #include <boost/thread/detail/move.hpp> +#include <boost/thread/detail/invoker.hpp> #include <boost/thread/thread_time.hpp> #include <boost/thread/mutex.hpp> #include <boost/thread/condition_variable.hpp> +#include <boost/thread/lock_algorithms.hpp> +#include <boost/thread/lock_types.hpp> #include <boost/exception_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> #include <boost/type_traits/is_fundamental.hpp> -#include <boost/type_traits/is_convertible.hpp> -#include <boost/type_traits/remove_reference.hpp> -#include <boost/type_traits/remove_cv.hpp> -#include <boost/mpl/if.hpp> +#include <boost/thread/detail/is_convertible.hpp> +#include <boost/type_traits/decay.hpp> +#include <boost/type_traits/is_void.hpp> +#include <boost/type_traits/conditional.hpp> #include <boost/config.hpp> #include <boost/throw_exception.hpp> #include <algorithm> #include <boost/function.hpp> #include <boost/bind.hpp> -#include <boost/ref.hpp> +#include <boost/core/ref.hpp> #include <boost/scoped_array.hpp> -#include <boost/utility/enable_if.hpp> +#include <boost/enable_shared_from_this.hpp> +#include <boost/core/enable_if.hpp> + #include <list> #include <boost/next_prior.hpp> #include <vector> -#include <boost/system/error_code.hpp> + +#include <boost/thread/future_error_code.hpp> #ifdef BOOST_THREAD_USES_CHRONO #include <boost/chrono/system_clocks.hpp> #endif #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS #include <boost/thread/detail/memory.hpp> +#include <boost/container/scoped_allocator.hpp> +#if ! defined BOOST_NO_CXX11_ALLOCATOR +#include <memory> +#endif #endif #include <boost/utility/result_of.hpp> -#include <boost/thread/thread.hpp> +#include <boost/thread/thread_only.hpp> + +#if defined BOOST_THREAD_PROVIDES_FUTURE_WHEN_ALL_WHEN_ANY +#include <boost/thread/csbl/tuple.hpp> +#include <boost/thread/csbl/vector.hpp> +#endif #if defined BOOST_THREAD_PROVIDES_FUTURE #define BOOST_THREAD_FUTURE future @@ -58,36 +74,18 @@ #define BOOST_THREAD_FUTURE unique_future #endif - namespace boost { - //enum class future_errc - BOOST_SCOPED_ENUM_DECLARE_BEGIN(future_errc) - { - broken_promise, - future_already_retrieved, - promise_already_satisfied, - no_state - } - BOOST_SCOPED_ENUM_DECLARE_END(future_errc) - - namespace system - { - template <> - struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc> : public true_type {}; - - #ifdef BOOST_NO_CXX11_SCOPED_ENUMS - template <> - struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc::enum_type> : public true_type { }; - #endif - } - //enum class launch BOOST_SCOPED_ENUM_DECLARE_BEGIN(launch) { + none = 0, async = 1, deferred = 2, +#ifdef BOOST_THREAD_PROVIDES_EXECUTORS + executor = 4, +#endif any = async | deferred } BOOST_SCOPED_ENUM_DECLARE_END(launch) @@ -101,26 +99,6 @@ namespace boost } BOOST_SCOPED_ENUM_DECLARE_END(future_status) - BOOST_THREAD_DECL - const system::error_category& future_category() BOOST_NOEXCEPT; - - namespace system - { - inline - error_code - make_error_code(future_errc e) //BOOST_NOEXCEPT - { - return error_code(underlying_cast<int>(e), boost::future_category()); - } - - inline - error_condition - make_error_condition(future_errc e) //BOOST_NOEXCEPT - { - return error_condition(underlying_cast<int>(e), future_category()); - } - } - class BOOST_SYMBOL_VISIBLE future_error : public std::logic_error { @@ -136,11 +114,6 @@ namespace boost { return ec_; } - const char* what() const BOOST_THREAD_NOEXCEPT_OR_THROW - { - return code().message().c_str(); - } - }; class BOOST_SYMBOL_VISIBLE future_uninitialized: @@ -185,49 +158,111 @@ namespace boost {} }; - class BOOST_SYMBOL_VISIBLE task_moved: - public future_error - { - public: - task_moved(): - future_error(system::make_error_code(future_errc::no_state)) - {} - }; + class BOOST_SYMBOL_VISIBLE task_moved: + public future_error + { + public: + task_moved(): + future_error(system::make_error_code(future_errc::no_state)) + {} + }; - class promise_moved: - public future_error - { - public: - promise_moved(): - future_error(system::make_error_code(future_errc::no_state)) - {} - }; + class promise_moved: + public future_error + { + public: + promise_moved(): + future_error(system::make_error_code(future_errc::no_state)) + {} + }; namespace future_state { - enum state { uninitialized, waiting, ready, moved }; + enum state { uninitialized, waiting, ready, moved, deferred }; } namespace detail { - struct future_object_base + struct relocker + { + boost::unique_lock<boost::mutex>& lock_; + bool unlocked_; + + relocker(boost::unique_lock<boost::mutex>& lk): + lock_(lk) + { + lock_.unlock(); + unlocked_=true; + } + ~relocker() + { + if (unlocked_) { + lock_.lock(); + } + } + void lock() { + if (unlocked_) { + lock_.lock(); + unlocked_=false; + } + } + private: + relocker& operator=(relocker const&); + }; + + struct shared_state_base : enable_shared_from_this<shared_state_base> { + typedef std::list<boost::condition_variable_any*> waiter_list; + // This type should be only included conditionally if interruptions are allowed, but is included to maintain the same layout. + typedef shared_ptr<shared_state_base> continuation_ptr_type; + boost::exception_ptr exception; bool done; - bool thread_was_interrupted; - boost::mutex mutex; + bool is_deferred_; + launch policy_; + bool is_constructed; + mutable boost::mutex mutex; boost::condition_variable waiters; - typedef std::list<boost::condition_variable_any*> waiter_list; waiter_list external_waiters; boost::function<void()> callback; + // This declaration should be only included conditionally if interruptions are allowed, but is included to maintain the same layout. + bool thread_was_interrupted; + // This declaration should be only included conditionally, but is included to maintain the same layout. + continuation_ptr_type continuation_ptr; - future_object_base(): + // This declaration should be only included conditionally, but is included to maintain the same layout. + virtual void launch_continuation(boost::unique_lock<boost::mutex>&) + { + } + + shared_state_base(): done(false), - thread_was_interrupted(false) + is_deferred_(false), + policy_(launch::none), + is_constructed(false), + thread_was_interrupted(false), + continuation_ptr() {} - virtual ~future_object_base() + virtual ~shared_state_base() {} + void set_deferred() + { + is_deferred_ = true; + policy_ = launch::deferred; + } + void set_async() + { + is_deferred_ = false; + policy_ = launch::async; + } +#ifdef BOOST_THREAD_PROVIDES_EXECUTORS + void set_executor() + { + is_deferred_ = false; + policy_ = launch::executor; + } +#endif waiter_list::iterator register_external_waiter(boost::condition_variable_any& cv) { boost::unique_lock<boost::mutex> lock(mutex); @@ -241,7 +276,32 @@ namespace boost external_waiters.erase(it); } - void mark_finished_internal() +#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION + void do_continuation(boost::unique_lock<boost::mutex>& lock) + { + if (continuation_ptr) { + continuation_ptr_type this_continuation_ptr = continuation_ptr; + continuation_ptr.reset(); + this_continuation_ptr->launch_continuation(lock); + //if (! lock.owns_lock()) + // lock.lock(); + } + } +#else + void do_continuation(boost::unique_lock<boost::mutex>&) + { + } +#endif +#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION + void set_continuation_ptr(continuation_ptr_type continuation, boost::unique_lock<boost::mutex>& lock) + { + continuation_ptr= continuation; + if (done) { + do_continuation(lock); + } + } +#endif + void mark_finished_internal(boost::unique_lock<boost::mutex>& lock) { done=true; waiters.notify_all(); @@ -250,24 +310,13 @@ namespace boost { (*it)->notify_all(); } + do_continuation(lock); } - - struct relocker + void make_ready() { - boost::unique_lock<boost::mutex>& lock; - - relocker(boost::unique_lock<boost::mutex>& lock_): - lock(lock_) - { - lock.unlock(); - } - ~relocker() - { - lock.lock(); - } - private: - relocker& operator=(relocker const&); - }; + boost::unique_lock<boost::mutex> lock(mutex); + mark_finished_internal(lock); + } void do_callback(boost::unique_lock<boost::mutex>& lock) { @@ -279,28 +328,50 @@ namespace boost } } - - void wait(bool rethrow=true) + void wait_internal(boost::unique_lock<boost::mutex> &lk, bool rethrow=true) { - boost::unique_lock<boost::mutex> lock(mutex); - do_callback(lock); - while(!done) - { - waiters.wait(lock); - } - if(rethrow && thread_was_interrupted) + do_callback(lk); + //if (!done) // fixme why this doesn't work? + { + if (is_deferred_) { - throw boost::thread_interrupted(); + is_deferred_=false; + execute(lk); + //lk.unlock(); } - if(rethrow && exception) + else { - boost::rethrow_exception(exception); + while(!done) + { + waiters.wait(lk); + } +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + if(rethrow && thread_was_interrupted) + { + throw boost::thread_interrupted(); + } +#endif + if(rethrow && exception) + { + boost::rethrow_exception(exception); + } } + } } + virtual void wait(bool rethrow=true) + { + boost::unique_lock<boost::mutex> lock(mutex); + wait_internal(lock, rethrow); + } + +#if defined BOOST_THREAD_USES_DATETIME bool timed_wait_until(boost::system_time const& target_time) { boost::unique_lock<boost::mutex> lock(mutex); + if (is_deferred_) + return false; + do_callback(lock); while(!done) { @@ -312,7 +383,7 @@ namespace boost } return true; } - +#endif #ifdef BOOST_THREAD_USES_CHRONO template <class Clock, class Duration> @@ -320,6 +391,8 @@ namespace boost wait_until(const chrono::time_point<Clock, Duration>& abs_time) { boost::unique_lock<boost::mutex> lock(mutex); + if (is_deferred_) + return future_status::deferred; do_callback(lock); while(!done) { @@ -332,63 +405,166 @@ namespace boost return future_status::ready; } #endif - void mark_exceptional_finish_internal(boost::exception_ptr const& e) + void mark_exceptional_finish_internal(boost::exception_ptr const& e, boost::unique_lock<boost::mutex>& lock) { exception=e; - mark_finished_internal(); + mark_finished_internal(lock); } + void mark_exceptional_finish() { - boost::lock_guard<boost::mutex> lock(mutex); - mark_exceptional_finish_internal(boost::current_exception()); + boost::unique_lock<boost::mutex> lock(mutex); + mark_exceptional_finish_internal(boost::current_exception(), lock); } + +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS void mark_interrupted_finish() { - boost::lock_guard<boost::mutex> lock(mutex); + boost::unique_lock<boost::mutex> lock(mutex); thread_was_interrupted=true; - mark_finished_internal(); + mark_finished_internal(lock); } - bool has_value() + + void set_interrupted_at_thread_exit() + { + unique_lock<boost::mutex> lk(mutex); + thread_was_interrupted=true; + if (has_value(lk)) + { + throw_exception(promise_already_satisfied()); + } + detail::make_ready_at_thread_exit(shared_from_this()); + } +#endif + + void set_exception_at_thread_exit(exception_ptr e) + { + unique_lock<boost::mutex> lk(mutex); + if (has_value(lk)) + { + throw_exception(promise_already_satisfied()); + } + exception=e; + this->is_constructed = true; + detail::make_ready_at_thread_exit(shared_from_this()); + + } + + bool has_value() const { boost::lock_guard<boost::mutex> lock(mutex); - return done && !(exception || thread_was_interrupted); + return done && !(exception +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + || thread_was_interrupted +#endif + ); + } + + bool has_value(unique_lock<boost::mutex>& ) const + { + return done && !(exception +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + || thread_was_interrupted +#endif + ); } - bool has_exception() + + bool has_exception() const { boost::lock_guard<boost::mutex> lock(mutex); - return done && (exception || thread_was_interrupted); + return done && (exception +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + || thread_was_interrupted +#endif + ); + } + + bool has_exception(unique_lock<boost::mutex>&) const + { + return done && (exception +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + || thread_was_interrupted +#endif + ); + } + + bool is_deferred(boost::lock_guard<boost::mutex>&) const { + return is_deferred_; + } + + launch launch_policy(boost::unique_lock<boost::mutex>&) const + { + return policy_; + } + + future_state::state get_state() const + { + boost::lock_guard<boost::mutex> guard(mutex); + if(!done) + { + return future_state::waiting; + } + else + { + return future_state::ready; + } + } + + exception_ptr get_exception_ptr() + { + boost::unique_lock<boost::mutex> lock(mutex); + return get_exception_ptr(lock); + } + exception_ptr get_exception_ptr(boost::unique_lock<boost::mutex>& lock) + { + wait_internal(lock, false); +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + if(thread_was_interrupted) + { + return copy_exception(boost::thread_interrupted()); + } +#endif + return exception; } template<typename F,typename U> void set_wait_callback(F f,U* u) { + boost::lock_guard<boost::mutex> lock(mutex); callback=boost::bind(f,boost::ref(*u)); } + virtual void execute(boost::unique_lock<boost::mutex>&) {} + private: - future_object_base(future_object_base const&); - future_object_base& operator=(future_object_base const&); + shared_state_base(shared_state_base const&); + shared_state_base& operator=(shared_state_base const&); }; template<typename T> struct future_traits { - typedef boost::scoped_ptr<T> storage_type; + typedef boost::scoped_ptr<T> storage_type; + struct dummy; #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES - typedef T const& source_reference_type; - struct dummy; - typedef typename boost::mpl::if_<boost::is_fundamental<T>,dummy&,BOOST_THREAD_RV_REF(T)>::type rvalue_source_type; - typedef typename boost::mpl::if_<boost::is_fundamental<T>,T,BOOST_THREAD_RV_REF(T)>::type move_dest_type; + typedef T const& source_reference_type; + //typedef typename conditional<boost::is_fundamental<T>::value,dummy&,BOOST_THREAD_RV_REF(T)>::type rvalue_source_type; + typedef BOOST_THREAD_RV_REF(T) rvalue_source_type; + //typedef typename conditional<boost::is_fundamental<T>::value,T,BOOST_THREAD_RV_REF(T)>::type move_dest_type; + typedef T move_dest_type; #elif defined BOOST_THREAD_USES_MOVE - typedef T& source_reference_type; - typedef typename boost::mpl::if_<boost::has_move_emulation_enabled<T>,BOOST_THREAD_RV_REF(T),T const&>::type rvalue_source_type; - typedef typename boost::mpl::if_<boost::has_move_emulation_enabled<T>,BOOST_THREAD_RV_REF(T),T>::type move_dest_type; + typedef typename conditional<boost::is_fundamental<T>::value,T,T&>::type source_reference_type; + //typedef typename conditional<boost::is_fundamental<T>::value,T,BOOST_THREAD_RV_REF(T)>::type rvalue_source_type; + //typedef typename conditional<boost::enable_move_utility_emulation<T>::value,BOOST_THREAD_RV_REF(T),T>::type move_dest_type; + typedef BOOST_THREAD_RV_REF(T) rvalue_source_type; + typedef T move_dest_type; #else - typedef T& source_reference_type; - typedef typename boost::mpl::if_<boost::is_convertible<T&,BOOST_THREAD_RV_REF(T) >,BOOST_THREAD_RV_REF(T),T const&>::type rvalue_source_type; - typedef typename boost::mpl::if_<boost::is_convertible<T&,BOOST_THREAD_RV_REF(T) >,BOOST_THREAD_RV_REF(T),T>::type move_dest_type; + typedef T& source_reference_type; + typedef typename conditional<boost::thread_detail::is_convertible<T&,BOOST_THREAD_RV_REF(T) >::value, BOOST_THREAD_RV_REF(T),T const&>::type rvalue_source_type; + typedef typename conditional<boost::thread_detail::is_convertible<T&,BOOST_THREAD_RV_REF(T) >::value, BOOST_THREAD_RV_REF(T),T>::type move_dest_type; #endif + typedef const T& shared_future_get_result_type; static void init(storage_type& storage,source_reference_type t) @@ -398,7 +574,11 @@ namespace boost static void init(storage_type& storage,rvalue_source_type t) { +#if ! defined BOOST_NO_CXX11_RVALUE_REFERENCES + storage.reset(new T(boost::forward<T>(t))); +#else storage.reset(new T(static_cast<rvalue_source_type>(t))); +#endif } static void cleanup(storage_type& storage) @@ -412,8 +592,8 @@ namespace boost { typedef T* storage_type; typedef T& source_reference_type; - struct rvalue_source_type - {}; + //struct rvalue_source_type + //{}; typedef T& move_dest_type; typedef T& shared_future_get_result_type; @@ -447,9 +627,10 @@ namespace boost }; + // Used to create stand-alone futures template<typename T> - struct future_object: - detail::future_object_base + struct shared_state: + detail::shared_state_base { typedef typename future_traits<T>::storage_type storage_type; typedef typename future_traits<T>::source_reference_type source_reference_type; @@ -459,117 +640,424 @@ namespace boost storage_type result; - future_object(): + shared_state(): result(0) {} - void mark_finished_with_result_internal(source_reference_type result_) + ~shared_state() + {} + + void mark_finished_with_result_internal(source_reference_type result_, boost::unique_lock<boost::mutex>& lock) { future_traits<T>::init(result,result_); - mark_finished_internal(); + this->mark_finished_internal(lock); } - void mark_finished_with_result_internal(rvalue_source_type result_) + void mark_finished_with_result_internal(rvalue_source_type result_, boost::unique_lock<boost::mutex>& lock) { +#if ! defined BOOST_NO_CXX11_RVALUE_REFERENCES + future_traits<T>::init(result,boost::forward<T>(result_)); +#else future_traits<T>::init(result,static_cast<rvalue_source_type>(result_)); - mark_finished_internal(); +#endif + this->mark_finished_internal(lock); } void mark_finished_with_result(source_reference_type result_) { - boost::lock_guard<boost::mutex> lock(mutex); - mark_finished_with_result_internal(result_); + boost::unique_lock<boost::mutex> lock(mutex); + this->mark_finished_with_result_internal(result_, lock); } void mark_finished_with_result(rvalue_source_type result_) { - boost::lock_guard<boost::mutex> lock(mutex); - mark_finished_with_result_internal(static_cast<rvalue_source_type>(result_)); + boost::unique_lock<boost::mutex> lock(mutex); + +#if ! defined BOOST_NO_CXX11_RVALUE_REFERENCES + mark_finished_with_result_internal(boost::forward<T>(result_), lock); +#else + mark_finished_with_result_internal(static_cast<rvalue_source_type>(result_), lock); +#endif } - move_dest_type get() + virtual move_dest_type get() { - wait(); - return static_cast<move_dest_type>(*result); + boost::unique_lock<boost::mutex> lock(mutex); + wait_internal(lock); + return boost::move(*result); } - shared_future_get_result_type get_sh() + virtual shared_future_get_result_type get_sh() { - wait(); - return static_cast<shared_future_get_result_type>(*result); + boost::unique_lock<boost::mutex> lock(mutex); + wait_internal(lock); + return *result; } - future_state::state get_state() + //void set_value_at_thread_exit(const T & result_) + void set_value_at_thread_exit(source_reference_type result_) { - boost::lock_guard<boost::mutex> guard(mutex); - if(!done) - { - return future_state::waiting; - } - else - { - return future_state::ready; - } + unique_lock<boost::mutex> lk(this->mutex); + if (this->has_value(lk)) + { + throw_exception(promise_already_satisfied()); + } + //future_traits<T>::init(result,result_); + result.reset(new T(result_)); + + this->is_constructed = true; + detail::make_ready_at_thread_exit(shared_from_this()); + } + //void set_value_at_thread_exit(BOOST_THREAD_RV_REF(T) result_) + void set_value_at_thread_exit(rvalue_source_type result_) + { + unique_lock<boost::mutex> lk(this->mutex); + if (this->has_value(lk)) + throw_exception(promise_already_satisfied()); + result.reset(new T(boost::move(result_))); + //future_traits<T>::init(result,static_cast<rvalue_source_type>(result_)); + this->is_constructed = true; + detail::make_ready_at_thread_exit(shared_from_this()); + } + + + private: + shared_state(shared_state const&); + shared_state& operator=(shared_state const&); + }; + + template<typename T> + struct shared_state<T&>: + detail::shared_state_base + { + typedef typename future_traits<T&>::storage_type storage_type; + typedef typename future_traits<T&>::source_reference_type source_reference_type; + typedef typename future_traits<T&>::move_dest_type move_dest_type; + typedef typename future_traits<T&>::shared_future_get_result_type shared_future_get_result_type; + + T* result; + + shared_state(): + result(0) + {} + + ~shared_state() + { + } + + void mark_finished_with_result_internal(source_reference_type result_, boost::unique_lock<boost::mutex>& lock) + { + //future_traits<T>::init(result,result_); + result= &result_; + mark_finished_internal(lock); + } + + void mark_finished_with_result(source_reference_type result_) + { + boost::unique_lock<boost::mutex> lock(mutex); + mark_finished_with_result_internal(result_, lock); + } + + virtual T& get() + { + boost::unique_lock<boost::mutex> lock(mutex); + wait_internal(lock); + return *result; + } + + virtual T& get_sh() + { + boost::unique_lock<boost::mutex> lock(mutex); + wait_internal(lock); + return *result; + } + + void set_value_at_thread_exit(T& result_) + { + unique_lock<boost::mutex> lk(this->mutex); + if (this->has_value(lk)) + throw_exception(promise_already_satisfied()); + //future_traits<T>::init(result,result_); + result= &result_; + this->is_constructed = true; + detail::make_ready_at_thread_exit(shared_from_this()); } private: - future_object(future_object const&); - future_object& operator=(future_object const&); + shared_state(shared_state const&); + shared_state& operator=(shared_state const&); }; template<> - struct future_object<void>: - detail::future_object_base + struct shared_state<void>: + detail::shared_state_base { typedef void shared_future_get_result_type; - future_object() + shared_state() {} - void mark_finished_with_result_internal() + void mark_finished_with_result_internal(boost::unique_lock<boost::mutex>& lock) { - mark_finished_internal(); + mark_finished_internal(lock); } void mark_finished_with_result() { - boost::lock_guard<boost::mutex> lock(mutex); - mark_finished_with_result_internal(); + boost::unique_lock<boost::mutex> lock(mutex); + mark_finished_with_result_internal(lock); } - void get() + virtual void get() { - wait(); + boost::unique_lock<boost::mutex> lock(mutex); + this->wait_internal(lock); } - void get_sh() + + virtual void get_sh() { - wait(); + boost::unique_lock<boost::mutex> lock(mutex); + this->wait_internal(lock); } - future_state::state get_state() + + void set_value_at_thread_exit() { - boost::lock_guard<boost::mutex> guard(mutex); - if(!done) - { - return future_state::waiting; - } - else - { - return future_state::ready; - } + unique_lock<boost::mutex> lk(this->mutex); + if (this->has_value(lk)) + { + throw_exception(promise_already_satisfied()); + } + this->is_constructed = true; + detail::make_ready_at_thread_exit(shared_from_this()); } private: - future_object(future_object const&); - future_object& operator=(future_object const&); + shared_state(shared_state const&); + shared_state& operator=(shared_state const&); + }; + + ///////////////////////// + /// future_async_shared_state_base + ///////////////////////// + template<typename Rp> + struct future_async_shared_state_base: shared_state<Rp> + { + typedef shared_state<Rp> base_type; + protected: + boost::thread thr_; + void join() + { + if (thr_.joinable()) thr_.join(); + } + public: + future_async_shared_state_base() + { + this->set_async(); + } + explicit future_async_shared_state_base(BOOST_THREAD_RV_REF(boost::thread) th) : + thr_(boost::move(th)) + { + this->set_async(); + } + + ~future_async_shared_state_base() + { + join(); + } + + virtual void wait(bool rethrow) + { + join(); + this->base_type::wait(rethrow); + } + }; + + ///////////////////////// + /// future_async_shared_state + ///////////////////////// + template<typename Rp, typename Fp> + struct future_async_shared_state: future_async_shared_state_base<Rp> + { + typedef future_async_shared_state_base<Rp> base_type; + + public: + explicit future_async_shared_state(BOOST_THREAD_FWD_REF(Fp) f) : + base_type(thread(&future_async_shared_state::run, this, boost::forward<Fp>(f))) + { + } + + static void run(future_async_shared_state* that, BOOST_THREAD_FWD_REF(Fp) f) + { + try + { + that->mark_finished_with_result(f()); + } +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + that->mark_interrupted_finish(); + } +#endif + catch(...) + { + that->mark_exceptional_finish(); + } + } + }; + + template<typename Fp> + struct future_async_shared_state<void, Fp>: public future_async_shared_state_base<void> + { + typedef future_async_shared_state_base<void> base_type; + + public: + explicit future_async_shared_state(BOOST_THREAD_FWD_REF(Fp) f) : + base_type(thread(&future_async_shared_state::run, this, boost::forward<Fp>(f))) + { + } + + static void run(future_async_shared_state* that, BOOST_THREAD_FWD_REF(Fp) f) + { + try + { + f(); + that->mark_finished_with_result(); + } +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + that->mark_interrupted_finish(); + } +#endif + catch(...) + { + that->mark_exceptional_finish(); + } + } + }; + + template<typename Rp, typename Fp> + struct future_async_shared_state<Rp&, Fp>: future_async_shared_state_base<Rp&> + { + typedef future_async_shared_state_base<Rp&> base_type; + + public: + explicit future_async_shared_state(BOOST_THREAD_FWD_REF(Fp) f) : + base_type(thread(&future_async_shared_state::run, this, boost::forward<Fp>(f))) + { + } + + static void run(future_async_shared_state* that, BOOST_THREAD_FWD_REF(Fp) f) + { + try + { + that->mark_finished_with_result(f()); + } +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + that->mark_interrupted_finish(); + } +#endif + catch(...) + { + that->mark_exceptional_finish(); + } + } + }; + + ////////////////////////// + /// future_deferred_shared_state + ////////////////////////// + template<typename Rp, typename Fp> + struct future_deferred_shared_state: shared_state<Rp> + { + typedef shared_state<Rp> base_type; + Fp func_; + + public: + explicit future_deferred_shared_state(BOOST_THREAD_FWD_REF(Fp) f) + : func_(boost::forward<Fp>(f)) + { + this->set_deferred(); + } + + virtual void execute(boost::unique_lock<boost::mutex>& lck) { + try + { + Fp local_fuct=boost::move(func_); + relocker relock(lck); + Rp res = local_fuct(); + relock.lock(); + this->mark_finished_with_result_internal(boost::move(res), lck); + } + catch (...) + { + this->mark_exceptional_finish_internal(current_exception(), lck); + } + } + }; + template<typename Rp, typename Fp> + struct future_deferred_shared_state<Rp&,Fp>: shared_state<Rp&> + { + typedef shared_state<Rp&> base_type; + Fp func_; + + public: + explicit future_deferred_shared_state(BOOST_THREAD_FWD_REF(Fp) f) + : func_(boost::forward<Fp>(f)) + { + this->set_deferred(); + } + + virtual void execute(boost::unique_lock<boost::mutex>& lck) { + try + { + this->mark_finished_with_result_internal(func_(), lck); + } + catch (...) + { + this->mark_exceptional_finish_internal(current_exception(), lck); + } + } + }; + + template<typename Fp> + struct future_deferred_shared_state<void,Fp>: shared_state<void> + { + typedef shared_state<void> base_type; + Fp func_; + + public: + explicit future_deferred_shared_state(BOOST_THREAD_FWD_REF(Fp) f) + : func_(boost::forward<Fp>(f)) + { + this->set_deferred(); + } + + virtual void execute(boost::unique_lock<boost::mutex>& lck) { + try + { + Fp local_fuct=boost::move(func_); + relocker relock(lck); + local_fuct(); + relock.lock(); + this->mark_finished_with_result_internal(lck); + } + catch (...) + { + this->mark_exceptional_finish_internal(current_exception(), lck); + } + } }; // template<typename T, typename Allocator> -// struct future_object_alloc: public future_object<T> +// struct shared_state_alloc: public shared_state<T> // { -// typedef future_object<T> base; +// typedef shared_state<T> base; // Allocator alloc_; // // public: -// explicit future_object_alloc(const Allocator& a) +// explicit shared_state_alloc(const Allocator& a) // : alloc_(a) {} // // }; @@ -580,38 +1068,33 @@ namespace boost struct registered_waiter { - boost::shared_ptr<detail::future_object_base> future_; - detail::future_object_base::waiter_list::iterator wait_iterator; + boost::shared_ptr<detail::shared_state_base> future_; + detail::shared_state_base::waiter_list::iterator wait_iterator; count_type index; - registered_waiter(boost::shared_ptr<detail::future_object_base> const& a_future, - detail::future_object_base::waiter_list::iterator wait_iterator_, + registered_waiter(boost::shared_ptr<detail::shared_state_base> const& a_future, + detail::shared_state_base::waiter_list::iterator wait_iterator_, count_type index_): future_(a_future),wait_iterator(wait_iterator_),index(index_) {} - }; struct all_futures_lock { #ifdef _MANAGED - typedef std::ptrdiff_t count_type_portable; + typedef std::ptrdiff_t count_type_portable; #else - typedef count_type count_type_portable; + typedef count_type count_type_portable; #endif - count_type_portable count; - boost::scoped_array<boost::unique_lock<boost::mutex> > locks; + count_type_portable count; + boost::scoped_array<boost::unique_lock<boost::mutex> > locks; all_futures_lock(std::vector<registered_waiter>& futures): count(futures.size()),locks(new boost::unique_lock<boost::mutex>[count]) { for(count_type_portable i=0;i<count;++i) { -#if defined __DECCXX || defined __SUNPRO_CC || defined __hpux - locks[i]=boost::unique_lock<boost::mutex>(futures[i].future_->mutex).move(); -#else - locks[i]=boost::unique_lock<boost::mutex>(futures[i].future_->mutex); -#endif + locks[i]=BOOST_THREAD_MAKE_RV_REF(boost::unique_lock<boost::mutex>(futures[i].future_->mutex)); } } @@ -643,11 +1126,25 @@ namespace boost { if(f.future_) { - futures.push_back(registered_waiter(f.future_,f.future_->register_external_waiter(cv),future_count)); + registered_waiter waiter(f.future_,f.future_->register_external_waiter(cv),future_count); + try { + futures.push_back(waiter); + } catch(...) { + f.future_->remove_external_waiter(waiter.wait_iterator); + throw; + } } ++future_count; } +#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES + template<typename F1, typename... Fs> + void add(F1& f1, Fs&... fs) + { + add(f1); add(fs...); + } +#endif + count_type wait() { all_futures_lock lk(futures); @@ -686,18 +1183,21 @@ namespace boost struct is_future_type { BOOST_STATIC_CONSTANT(bool, value=false); + typedef void type; }; template<typename T> struct is_future_type<BOOST_THREAD_FUTURE<T> > { BOOST_STATIC_CONSTANT(bool, value=true); + typedef T type; }; template<typename T> struct is_future_type<shared_future<T> > { BOOST_STATIC_CONSTANT(bool, value=true); + typedef T type; }; template<typename Iterator> @@ -709,6 +1209,7 @@ namespace boost } } +#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES template<typename F1,typename F2> typename boost::enable_if<is_future_type<F1>,void>::type wait_for_all(F1& f1,F2& f2) { @@ -742,6 +1243,16 @@ namespace boost f4.wait(); f5.wait(); } +#else + template<typename F1, typename... Fs> + void wait_for_all(F1& f1, Fs&... fs) + { + bool dummy[] = { (f1.wait(), true), (fs.wait(), true)... }; + + // prevent unused parameter warning + (void) dummy; + } +#endif // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) template<typename Iterator> typename boost::disable_if<is_future_type<Iterator>,Iterator>::type wait_for_any(Iterator begin,Iterator end) @@ -757,6 +1268,7 @@ namespace boost return boost::next(begin,waiter.wait()); } +#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES template<typename F1,typename F2> typename boost::enable_if<is_future_type<F1>,unsigned>::type wait_for_any(F1& f1,F2& f2) { @@ -798,6 +1310,15 @@ namespace boost waiter.add(f5); return waiter.wait(); } +#else + template<typename F1, typename... Fs> + typename boost::enable_if<is_future_type<F1>, unsigned>::type wait_for_any(F1& f1, Fs&... fs) + { + detail::future_waiter waiter; + waiter.add(f1, fs...); + return waiter.wait(); + } +#endif // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) template <typename R> class promise; @@ -805,72 +1326,70 @@ namespace boost template <typename R> class packaged_task; - template <typename R> - class BOOST_THREAD_FUTURE + namespace detail { - private: + /// Common implementation for all the futures independently of the return type + class base_future + { + //BOOST_THREAD_MOVABLE(base_future) - typedef boost::shared_ptr<detail::future_object<R> > future_ptr; + }; + /// Common implementation for future and shared_future. + template <typename R> + class basic_future : public base_future + { + protected: + public: + + typedef boost::shared_ptr<detail::shared_state<R> > future_ptr; + static //BOOST_CONSTEXPR + future_ptr make_exceptional_future_ptr(exceptional_ptr const& ex) { + promise<R> p; + p.set_exception(ex.ptr_); + return p.get_future().future_; + } future_ptr future_; - friend class shared_future<R>; - friend class promise<R>; - friend class packaged_task<R>; - friend class detail::future_waiter; + basic_future(future_ptr a_future): + future_(a_future) + { + } + // Copy construction from a shared_future + explicit basic_future(const shared_future<R>&) BOOST_NOEXCEPT; - typedef typename detail::future_traits<R>::move_dest_type move_dest_type; + public: + typedef future_state::state state; - BOOST_THREAD_FUTURE(future_ptr a_future): - future_(a_future) - {} + BOOST_THREAD_MOVABLE(basic_future) + basic_future(): future_() {} - public: - BOOST_THREAD_MOVABLE_ONLY(BOOST_THREAD_FUTURE) - typedef future_state::state state; - BOOST_THREAD_FUTURE() - {} + //BOOST_CONSTEXPR + basic_future(exceptional_ptr const& ex) + : future_(make_exceptional_future_ptr(ex)) + { + } - ~BOOST_THREAD_FUTURE() - {} + ~basic_future() {} - BOOST_THREAD_FUTURE(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT: - future_(BOOST_THREAD_RV(other).future_) + basic_future(BOOST_THREAD_RV_REF(basic_future) other) BOOST_NOEXCEPT: + future_(BOOST_THREAD_RV(other).future_) { BOOST_THREAD_RV(other).future_.reset(); } - - BOOST_THREAD_FUTURE& operator=(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT + basic_future& operator=(BOOST_THREAD_RV_REF(basic_future) other) BOOST_NOEXCEPT { future_=BOOST_THREAD_RV(other).future_; BOOST_THREAD_RV(other).future_.reset(); return *this; } - - shared_future<R> share() + void swap(basic_future& that) BOOST_NOEXCEPT { - return shared_future<R>(::boost::move(*this)); - } - - void swap(BOOST_THREAD_FUTURE& other) - { - future_.swap(other.future_); - } - - // retrieving the value - move_dest_type get() - { - if(!future_) - { - boost::throw_exception(future_uninitialized()); - } - - return future_->get(); + future_.swap(that.future_); } - // functions to check state, and wait for ready - state get_state() const BOOST_NOEXCEPT + state get_state() const { if(!future_) { @@ -879,21 +1398,34 @@ namespace boost return future_->get_state(); } - bool is_ready() const BOOST_NOEXCEPT + bool is_ready() const { return get_state()==future_state::ready; } - bool has_exception() const BOOST_NOEXCEPT + bool has_exception() const { return future_ && future_->has_exception(); } - bool has_value() const BOOST_NOEXCEPT + bool has_value() const { return future_ && future_->has_value(); } + launch launch_policy(boost::unique_lock<boost::mutex>& lk) const + { + if ( future_ ) return future_->launch_policy(lk); + else return launch(launch::none); + } + + exception_ptr get_exception_ptr() + { + return future_ + ? future_->get_exception_ptr() + : exception_ptr(); + } + bool valid() const BOOST_NOEXCEPT { return future_ != 0; @@ -909,6 +1441,7 @@ namespace boost future_->wait(false); } +#if defined BOOST_THREAD_USES_DATETIME template<typename Duration> bool timed_wait(Duration const& rel_time) const { @@ -923,6 +1456,7 @@ namespace boost } return future_->timed_wait_until(abs_time); } +#endif #ifdef BOOST_THREAD_USES_CHRONO template <class Rep, class Period> future_status @@ -942,177 +1476,776 @@ namespace boost return future_->wait_until(abs_time); } #endif + + }; + + } // detail + BOOST_THREAD_DCL_MOVABLE_BEG(R) detail::basic_future<R> BOOST_THREAD_DCL_MOVABLE_END + + namespace detail + { +#if (!defined _MSC_VER || _MSC_VER >= 1400) // _MSC_VER == 1400 on MSVC 2005 + template <class Rp, class Fp> + BOOST_THREAD_FUTURE<Rp> + make_future_async_shared_state(BOOST_THREAD_FWD_REF(Fp) f); + + template <class Rp, class Fp> + BOOST_THREAD_FUTURE<Rp> + make_future_deferred_shared_state(BOOST_THREAD_FWD_REF(Fp) f); +#endif // #if (!defined _MSC_VER || _MSC_VER >= 1400) +#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION + template<typename F, typename Rp, typename Fp> + struct future_deferred_continuation_shared_state; + template<typename F, typename Rp, typename Fp> + struct future_async_continuation_shared_state; + + template <class F, class Rp, class Fp> + BOOST_THREAD_FUTURE<Rp> + make_future_async_continuation_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c); + + template <class F, class Rp, class Fp> + BOOST_THREAD_FUTURE<Rp> + make_future_deferred_continuation_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c); +#endif +#if defined BOOST_THREAD_PROVIDES_FUTURE_UNWRAP + template<typename F, typename Rp> + struct future_unwrap_shared_state; + template <class F, class Rp> + inline BOOST_THREAD_FUTURE<Rp> + make_future_unwrap_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f); +#endif + } + + template <typename R> + class BOOST_THREAD_FUTURE : public detail::basic_future<R> + { + private: + typedef detail::basic_future<R> base_type; + typedef typename base_type::future_ptr future_ptr; + + friend class shared_future<R>; + friend class promise<R>; +#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION + template <typename, typename, typename> + friend struct detail::future_async_continuation_shared_state; + template <typename, typename, typename> + friend struct detail::future_deferred_continuation_shared_state; + + template <class F, class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_async_continuation_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c); + + template <class F, class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_deferred_continuation_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c); +#endif +#if defined BOOST_THREAD_PROVIDES_FUTURE_UNWRAP + template<typename F, typename Rp> + friend struct detail::future_unwrap_shared_state; + template <class F, class Rp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_unwrap_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f); +#endif +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + template <class> friend class packaged_task; // todo check if this works in windows +#else + friend class packaged_task<R>; +#endif + friend class detail::future_waiter; + + template <class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_async_shared_state(BOOST_THREAD_FWD_REF(Fp) f); + + template <class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_deferred_shared_state(BOOST_THREAD_FWD_REF(Fp) f); + + + typedef typename detail::future_traits<R>::move_dest_type move_dest_type; + public: // when_all + + BOOST_THREAD_FUTURE(future_ptr a_future): + base_type(a_future) + { + } + + public: + BOOST_THREAD_MOVABLE_ONLY(BOOST_THREAD_FUTURE) + typedef future_state::state state; + typedef R value_type; // EXTENSION + + BOOST_CONSTEXPR BOOST_THREAD_FUTURE() {} + //BOOST_CONSTEXPR + BOOST_THREAD_FUTURE(exceptional_ptr const& ex): + base_type(ex) {} + + ~BOOST_THREAD_FUTURE() {} + + BOOST_THREAD_FUTURE(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT: + base_type(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other)))) + { + } + inline BOOST_THREAD_FUTURE(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE<BOOST_THREAD_FUTURE<R> >) other); // EXTENSION + + BOOST_THREAD_FUTURE& operator=(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT + { + this->base_type::operator=(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other)))); + return *this; + } + +// BOOST_THREAD_FUTURE& operator=(exceptional_ptr const& ex) +// { +// this->future_=base_type::make_exceptional_future_ptr(ex); +// return *this; +// } + + shared_future<R> share() + { + return shared_future<R>(::boost::move(*this)); + } + + void swap(BOOST_THREAD_FUTURE& other) + { + static_cast<base_type*>(this)->swap(other); + } + + // todo this function must be private and friendship provided to the internal users. + void set_async() + { + this->future_->set_async(); + } + // todo this function must be private and friendship provided to the internal users. + void set_deferred() + { + this->future_->set_deferred(); + } + + // retrieving the value + move_dest_type get() + { + if(!this->future_) + { + boost::throw_exception(future_uninitialized()); + } + future_ptr fut_=this->future_; +#ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET + this->future_.reset(); +#endif + return fut_->get(); + } + + template <typename R2> + typename boost::disable_if< is_void<R2>, move_dest_type>::type + get_or(BOOST_THREAD_RV_REF(R2) v) + { + if(!this->future_) + { + boost::throw_exception(future_uninitialized()); + } + this->future_->wait(false); + future_ptr fut_=this->future_; +#ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET + this->future_.reset(); +#endif + if (fut_->has_value()) { + return fut_->get(); + } + else { + return boost::move(v); + } + } + + template <typename R2> + typename boost::disable_if< is_void<R2>, move_dest_type>::type + get_or(R2 const& v) // EXTENSION + { + if(!this->future_) + { + boost::throw_exception(future_uninitialized()); + } + this->future_->wait(false); + future_ptr fut_=this->future_; +#ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET + this->future_.reset(); +#endif + if (fut_->has_value()) { + return fut_->get(); + } + else { + return v; + } + } + + +#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION + +// template<typename F> +// auto then(F&& func) -> BOOST_THREAD_FUTURE<decltype(func(*this))>; + +//#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) +// template<typename RF> +// inline BOOST_THREAD_FUTURE<RF> then(RF(*func)(BOOST_THREAD_FUTURE&)); +// template<typename RF> +// inline BOOST_THREAD_FUTURE<RF> then(launch policy, RF(*func)(BOOST_THREAD_FUTURE&)); +//#endif + template<typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE)>::type> + then(BOOST_THREAD_FWD_REF(F) func); // EXTENSION + template<typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE)>::type> + then(launch policy, BOOST_THREAD_FWD_REF(F) func); // EXTENSION + + template <typename R2> + inline typename boost::disable_if< is_void<R2>, BOOST_THREAD_FUTURE<R> >::type + fallback_to(BOOST_THREAD_RV_REF(R2) v); // EXTENSION + template <typename R2> + inline typename boost::disable_if< is_void<R2>, BOOST_THREAD_FUTURE<R> >::type + fallback_to(R2 const& v); // EXTENSION + +#endif + +//#if defined BOOST_THREAD_PROVIDES_FUTURE_UNWRAP +// inline +// typename boost::enable_if< +// is_future_type<value_type>, +// value_type +// //BOOST_THREAD_FUTURE<typename is_future_type<value_type>::type> +// >::type +// unwrap(); +//#endif + }; BOOST_THREAD_DCL_MOVABLE_BEG(T) BOOST_THREAD_FUTURE<T> BOOST_THREAD_DCL_MOVABLE_END + template <typename R2> + class BOOST_THREAD_FUTURE<BOOST_THREAD_FUTURE<R2> > : public detail::basic_future<BOOST_THREAD_FUTURE<R2> > + { + typedef BOOST_THREAD_FUTURE<R2> R; + + private: + typedef detail::basic_future<R> base_type; + typedef typename base_type::future_ptr future_ptr; + + friend class shared_future<R>; + friend class promise<R>; + #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION + template <typename, typename, typename> + friend struct detail::future_async_continuation_shared_state; + template <typename, typename, typename> + friend struct detail::future_deferred_continuation_shared_state; + + template <class F, class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_async_continuation_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c); + + template <class F, class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_deferred_continuation_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c); + #endif +#if defined BOOST_THREAD_PROVIDES_FUTURE_UNWRAP + template<typename F, typename Rp> + friend struct detail::future_unwrap_shared_state; + template <class F, class Rp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_unwrap_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f); +#endif + #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + template <class> friend class packaged_task; // todo check if this works in windows + #else + friend class packaged_task<R>; + #endif + friend class detail::future_waiter; + + template <class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_async_shared_state(BOOST_THREAD_FWD_REF(Fp) f); + + template <class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_deferred_shared_state(BOOST_THREAD_FWD_REF(Fp) f); + + + typedef typename detail::future_traits<R>::move_dest_type move_dest_type; + + BOOST_THREAD_FUTURE(future_ptr a_future): + base_type(a_future) + { + } + + public: + BOOST_THREAD_MOVABLE_ONLY(BOOST_THREAD_FUTURE) + typedef future_state::state state; + typedef R value_type; // EXTENSION + + BOOST_CONSTEXPR BOOST_THREAD_FUTURE() {} + //BOOST_CONSTEXPR + BOOST_THREAD_FUTURE(exceptional_ptr const& ex): + base_type(ex) {} + + ~BOOST_THREAD_FUTURE() {} + + BOOST_THREAD_FUTURE(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT: + base_type(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other)))) + { + } + + BOOST_THREAD_FUTURE& operator=(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT + { + this->base_type::operator=(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other)))); + return *this; + } +// BOOST_THREAD_FUTURE& operator=(exceptional_ptr const& ex) +// { +// this->future_=base_type::make_exceptional_future_ptr(ex); +// return *this; +// } + + shared_future<R> share() + { + return shared_future<R>(::boost::move(*this)); + } + + void swap(BOOST_THREAD_FUTURE& other) + { + static_cast<base_type*>(this)->swap(other); + } + + // todo this function must be private and friendship provided to the internal users. + void set_async() + { + this->future_->set_async(); + } + // todo this function must be private and friendship provided to the internal users. + void set_deferred() + { + this->future_->set_deferred(); + } + + // retrieving the value + move_dest_type get() + { + if(!this->future_) + { + boost::throw_exception(future_uninitialized()); + } + future_ptr fut_=this->future_; + #ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET + this->future_.reset(); + #endif + return fut_->get(); + } + move_dest_type get_or(BOOST_THREAD_RV_REF(R) v) // EXTENSION + { + if(!this->future_) + { + boost::throw_exception(future_uninitialized()); + } + this->future_->wait(false); + future_ptr fut_=this->future_; + #ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET + this->future_.reset(); + #endif + if (fut_->has_value()) return fut_->get(); + else return boost::move(v); + } + + move_dest_type get_or(R const& v) // EXTENSION + { + if(!this->future_) + { + boost::throw_exception(future_uninitialized()); + } + this->future_->wait(false); + future_ptr fut_=this->future_; + #ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET + this->future_.reset(); + #endif + if (fut_->has_value()) return fut_->get(); + else return v; + } + + + #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION + + // template<typename F> + // auto then(F&& func) -> BOOST_THREAD_FUTURE<decltype(func(*this))>; + + //#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) + // template<typename RF> + // inline BOOST_THREAD_FUTURE<RF> then(RF(*func)(BOOST_THREAD_FUTURE&)); + // template<typename RF> + // inline BOOST_THREAD_FUTURE<RF> then(launch policy, RF(*func)(BOOST_THREAD_FUTURE&)); + //#endif + template<typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE)>::type> + then(BOOST_THREAD_FWD_REF(F) func); // EXTENSION + template<typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE)>::type> + then(launch policy, BOOST_THREAD_FWD_REF(F) func); // EXTENSION + #endif + + #if defined BOOST_THREAD_PROVIDES_FUTURE_UNWRAP + inline + BOOST_THREAD_FUTURE<R2> + unwrap(); // EXTENSION + #endif + + }; + template <typename R> - class shared_future + class shared_future : public detail::basic_future<R> { - typedef boost::shared_ptr<detail::future_object<R> > future_ptr; - future_ptr future_; + typedef detail::basic_future<R> base_type; + typedef typename base_type::future_ptr future_ptr; friend class detail::future_waiter; friend class promise<R>; - friend class packaged_task<R>; +#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION + template <typename, typename, typename> + friend struct detail::future_async_continuation_shared_state; + template <typename, typename, typename> + friend struct detail::future_deferred_continuation_shared_state; + + template <class F, class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_async_continuation_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c); + + template <class F, class Rp, class Fp> + friend BOOST_THREAD_FUTURE<Rp> + detail::make_future_deferred_continuation_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c); +#endif +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + template <class> friend class packaged_task;// todo check if this works in windows +#else + friend class packaged_task<R>; +#endif shared_future(future_ptr a_future): - future_(a_future) + base_type(a_future) {} public: BOOST_THREAD_MOVABLE(shared_future) + typedef R value_type; // EXTENSION shared_future(shared_future const& other): - future_(other.future_) + base_type(other) {} typedef future_state::state state; - shared_future() + BOOST_CONSTEXPR shared_future() {} - + //BOOST_CONSTEXPR + shared_future(exceptional_ptr const& ex): + base_type(ex) {} ~shared_future() {} shared_future& operator=(shared_future const& other) { - future_=other.future_; + shared_future(other).swap(*this); return *this; } +// shared_future& operator=(exceptional_ptr const& ex) +// { +// this->future_=base_type::make_exceptional_future_ptr(ex); +// return *this; +// } + shared_future(BOOST_THREAD_RV_REF(shared_future) other) BOOST_NOEXCEPT : - future_(BOOST_THREAD_RV(other).future_) + base_type(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other)))) { BOOST_THREAD_RV(other).future_.reset(); } - shared_future(BOOST_THREAD_RV_REF_BEG BOOST_THREAD_FUTURE<R> BOOST_THREAD_RV_REF_END other) BOOST_NOEXCEPT : - future_(BOOST_THREAD_RV(other).future_) + shared_future(BOOST_THREAD_RV_REF( BOOST_THREAD_FUTURE<R> ) other) BOOST_NOEXCEPT : + base_type(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other)))) { - BOOST_THREAD_RV(other).future_.reset(); } + shared_future& operator=(BOOST_THREAD_RV_REF(shared_future) other) BOOST_NOEXCEPT { - future_.swap(BOOST_THREAD_RV(other).future_); - BOOST_THREAD_RV(other).future_.reset(); + base_type::operator=(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other)))); return *this; } - shared_future& operator=(BOOST_THREAD_RV_REF_BEG BOOST_THREAD_FUTURE<R> BOOST_THREAD_RV_REF_END other) BOOST_NOEXCEPT + shared_future& operator=(BOOST_THREAD_RV_REF( BOOST_THREAD_FUTURE<R> ) other) BOOST_NOEXCEPT { - future_.swap(BOOST_THREAD_RV(other).future_); - BOOST_THREAD_RV(other).future_.reset(); + base_type::operator=(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other)))); return *this; } void swap(shared_future& other) BOOST_NOEXCEPT { - future_.swap(other.future_); + static_cast<base_type*>(this)->swap(other); } // retrieving the value - typename detail::future_object<R>::shared_future_get_result_type get() + typename detail::shared_state<R>::shared_future_get_result_type get() { - if(!future_) + if(!this->future_) { boost::throw_exception(future_uninitialized()); } - return future_->get_sh(); + return this->future_->get_sh(); } - // functions to check state, and wait for ready - state get_state() const BOOST_NOEXCEPT + template <typename R2> + typename boost::disable_if< is_void<R2>, typename detail::shared_state<R>::shared_future_get_result_type>::type + get_or(BOOST_THREAD_RV_REF(R2) v) // EXTENSION { - if(!future_) + if(!this->future_) { - return future_state::uninitialized; + boost::throw_exception(future_uninitialized()); } - return future_->get_state(); + future_ptr fut_=this->future_; + fut_->wait(); + if (fut_->has_value()) return fut_->get_sh(); + else return boost::move(v); } - bool valid() const BOOST_NOEXCEPT +#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION + +// template<typename F> +// auto then(F&& func) -> BOOST_THREAD_FUTURE<decltype(func(*this))>; +// template<typename F> +// auto then(launch, F&& func) -> BOOST_THREAD_FUTURE<decltype(func(*this))>; + +//#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) +// template<typename RF> +// inline BOOST_THREAD_FUTURE<RF> then(RF(*func)(shared_future&)); +// template<typename RF> +// inline BOOST_THREAD_FUTURE<RF> then(launch policy, RF(*func)(shared_future&)); +//#endif + template<typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(shared_future)>::type> + then(BOOST_THREAD_FWD_REF(F) func); // EXTENSION + template<typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(shared_future)>::type> + then(launch policy, BOOST_THREAD_FWD_REF(F) func); // EXTENSION +#endif +//#if defined BOOST_THREAD_PROVIDES_FUTURE_UNWRAP +// inline +// typename boost::enable_if_c< +// is_future_type<value_type>::value, +// BOOST_THREAD_FUTURE<typename is_future_type<value_type>::type> +// >::type +// unwrap(); +//#endif + + }; + + BOOST_THREAD_DCL_MOVABLE_BEG(T) shared_future<T> BOOST_THREAD_DCL_MOVABLE_END + + namespace detail + { + /// Copy construction from a shared_future + template <typename R> + inline basic_future<R>::basic_future(const shared_future<R>& other) BOOST_NOEXCEPT + : future_(other.future_) + { + } + } + + template <typename R> + class promise + { + typedef boost::shared_ptr<detail::shared_state<R> > future_ptr; + + future_ptr future_; + bool future_obtained; + + void lazy_init() { - return future_ != 0; +#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY +#include <boost/detail/atomic_undef_macros.hpp> + if(!atomic_load(&future_)) + { + future_ptr blank; + atomic_compare_exchange(&future_,&blank,future_ptr(new detail::shared_state<R>)); + } +#include <boost/detail/atomic_redef_macros.hpp> +#endif } - bool is_ready() const BOOST_NOEXCEPT + public: + BOOST_THREAD_MOVABLE_ONLY(promise) +#if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS + template <class Allocator> + promise(boost::allocator_arg_t, Allocator a) { - return get_state()==future_state::ready; + typedef typename Allocator::template rebind<detail::shared_state<R> >::other A2; + A2 a2(a); + typedef thread_detail::allocator_destructor<A2> D; + + future_ = future_ptr(::new(a2.allocate(1)) detail::shared_state<R>(), D(a2, 1) ); + future_obtained = false; } +#endif + promise(): +#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY + future_(), +#else + future_(new detail::shared_state<R>()), +#endif + future_obtained(false) + {} - bool has_exception() const BOOST_NOEXCEPT + ~promise() { - return future_ && future_->has_exception(); + if(future_) + { + boost::unique_lock<boost::mutex> lock(future_->mutex); + + if(!future_->done && !future_->is_constructed) + { + future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise()), lock); + } + } } - bool has_value() const BOOST_NOEXCEPT + // Assignment + promise(BOOST_THREAD_RV_REF(promise) rhs) BOOST_NOEXCEPT : + future_(BOOST_THREAD_RV(rhs).future_),future_obtained(BOOST_THREAD_RV(rhs).future_obtained) { - return future_ && future_->has_value(); + BOOST_THREAD_RV(rhs).future_.reset(); + BOOST_THREAD_RV(rhs).future_obtained=false; + } + promise & operator=(BOOST_THREAD_RV_REF(promise) rhs) BOOST_NOEXCEPT + { + future_=BOOST_THREAD_RV(rhs).future_; + future_obtained=BOOST_THREAD_RV(rhs).future_obtained; + BOOST_THREAD_RV(rhs).future_.reset(); + BOOST_THREAD_RV(rhs).future_obtained=false; + return *this; } - void wait() const + void swap(promise& other) { - if(!future_) + future_.swap(other.future_); + std::swap(future_obtained,other.future_obtained); + } + + // Result retrieval + BOOST_THREAD_FUTURE<R> get_future() + { + lazy_init(); + if (future_.get()==0) { - boost::throw_exception(future_uninitialized()); + boost::throw_exception(promise_moved()); } - future_->wait(false); + if (future_obtained) + { + boost::throw_exception(future_already_retrieved()); + } + future_obtained=true; + return BOOST_THREAD_FUTURE<R>(future_); } - template<typename Duration> - bool timed_wait(Duration const& rel_time) const + void set_value(typename detail::future_traits<R>::source_reference_type r) { - return timed_wait_until(boost::get_system_time()+rel_time); + lazy_init(); + boost::unique_lock<boost::mutex> lock(future_->mutex); + if(future_->done) + { + boost::throw_exception(promise_already_satisfied()); + } + future_->mark_finished_with_result_internal(r, lock); } - bool timed_wait_until(boost::system_time const& abs_time) const +// void set_value(R && r); + void set_value(typename detail::future_traits<R>::rvalue_source_type r) { - if(!future_) + lazy_init(); + boost::unique_lock<boost::mutex> lock(future_->mutex); + if(future_->done) { - boost::throw_exception(future_uninitialized()); + boost::throw_exception(promise_already_satisfied()); } - return future_->timed_wait_until(abs_time); +#if ! defined BOOST_NO_CXX11_RVALUE_REFERENCES + future_->mark_finished_with_result_internal(boost::forward<R>(r), lock); +#else + future_->mark_finished_with_result_internal(static_cast<typename detail::future_traits<R>::rvalue_source_type>(r), lock); +#endif } -#ifdef BOOST_THREAD_USES_CHRONO - template <class Rep, class Period> - future_status - wait_for(const chrono::duration<Rep, Period>& rel_time) const + void set_exception(boost::exception_ptr p) { - return wait_until(chrono::steady_clock::now() + rel_time); + lazy_init(); + boost::unique_lock<boost::mutex> lock(future_->mutex); + if(future_->done) + { + boost::throw_exception(promise_already_satisfied()); + } + future_->mark_exceptional_finish_internal(p, lock); + } + template <typename E> + void set_exception(E ex) + { + set_exception(copy_exception(ex)); + } + // setting the result with deferred notification + void set_value_at_thread_exit(const R& r) + { + if (future_.get()==0) + { + boost::throw_exception(promise_moved()); + } + future_->set_value_at_thread_exit(r); + } + void set_value_at_thread_exit(BOOST_THREAD_RV_REF(R) r) + { + if (future_.get()==0) + { + boost::throw_exception(promise_moved()); + } + future_->set_value_at_thread_exit(boost::move(r)); } - template <class Clock, class Duration> - future_status - wait_until(const chrono::time_point<Clock, Duration>& abs_time) const + void set_exception_at_thread_exit(exception_ptr e) { - if(!future_) + if (future_.get()==0) { - boost::throw_exception(future_uninitialized()); + boost::throw_exception(promise_moved()); } - return future_->wait_until(abs_time); + future_->set_exception_at_thread_exit(e); + } + template <typename E> + void set_exception_at_thread_exit(E ex) + { + set_exception_at_thread_exit(copy_exception(ex)); } -#endif - }; - BOOST_THREAD_DCL_MOVABLE_BEG(T) shared_future<T> BOOST_THREAD_DCL_MOVABLE_END + template<typename F> + void set_wait_callback(F f) + { + lazy_init(); + future_->set_wait_callback(f,this); + } + + }; template <typename R> - class promise + class promise<R&> { - typedef boost::shared_ptr<detail::future_object<R> > future_ptr; + typedef boost::shared_ptr<detail::shared_state<R&> > future_ptr; future_ptr future_; bool future_obtained; void lazy_init() { -#if defined BOOST_THREAD_PROMISE_LAZY +#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY +#include <boost/detail/atomic_undef_macros.hpp> if(!atomic_load(&future_)) { future_ptr blank; - atomic_compare_exchange(&future_,&blank,future_ptr(new detail::future_object<R>)); + atomic_compare_exchange(&future_,&blank,future_ptr(new detail::shared_state<R&>)); } +#include <boost/detail/atomic_redef_macros.hpp> #endif } @@ -1122,19 +2255,19 @@ namespace boost template <class Allocator> promise(boost::allocator_arg_t, Allocator a) { - typedef typename Allocator::template rebind<detail::future_object<R> >::other A2; + typedef typename Allocator::template rebind<detail::shared_state<R&> >::other A2; A2 a2(a); typedef thread_detail::allocator_destructor<A2> D; - future_ = future_ptr(::new(a2.allocate(1)) detail::future_object<R>(), D(a2, 1) ); + future_ = future_ptr(::new(a2.allocate(1)) detail::shared_state<R&>(), D(a2, 1) ); future_obtained = false; } #endif promise(): -#if defined BOOST_THREAD_PROMISE_LAZY +#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY future_(), #else - future_(new detail::future_object<R>()), + future_(new detail::shared_state<R&>()), #endif future_obtained(false) {} @@ -1143,11 +2276,11 @@ namespace boost { if(future_) { - boost::lock_guard<boost::mutex> lock(future_->mutex); + boost::unique_lock<boost::mutex> lock(future_->mutex); - if(!future_->done) + if(!future_->done && !future_->is_constructed) { - future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise())); + future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise()), lock); } } } @@ -1175,7 +2308,7 @@ namespace boost } // Result retrieval - BOOST_THREAD_FUTURE<R> get_future() + BOOST_THREAD_FUTURE<R&> get_future() { lazy_init(); if (future_.get()==0) @@ -1187,47 +2320,59 @@ namespace boost boost::throw_exception(future_already_retrieved()); } future_obtained=true; - return BOOST_THREAD_FUTURE<R>(future_); + return BOOST_THREAD_FUTURE<R&>(future_); } - void set_value(typename detail::future_traits<R>::source_reference_type r) + void set_value(R& r) { lazy_init(); - boost::lock_guard<boost::mutex> lock(future_->mutex); + boost::unique_lock<boost::mutex> lock(future_->mutex); if(future_->done) { boost::throw_exception(promise_already_satisfied()); } - future_->mark_finished_with_result_internal(r); + future_->mark_finished_with_result_internal(r, lock); } -// void set_value(R && r); - void set_value(typename detail::future_traits<R>::rvalue_source_type r) + void set_exception(boost::exception_ptr p) { lazy_init(); - boost::lock_guard<boost::mutex> lock(future_->mutex); + boost::unique_lock<boost::mutex> lock(future_->mutex); if(future_->done) { boost::throw_exception(promise_already_satisfied()); } - future_->mark_finished_with_result_internal(static_cast<typename detail::future_traits<R>::rvalue_source_type>(r)); + future_->mark_exceptional_finish_internal(p, lock); } - - void set_exception(boost::exception_ptr p) + template <typename E> + void set_exception(E ex) { - lazy_init(); - boost::lock_guard<boost::mutex> lock(future_->mutex); - if(future_->done) - { - boost::throw_exception(promise_already_satisfied()); - } - future_->mark_exceptional_finish_internal(p); + set_exception(copy_exception(ex)); } // setting the result with deferred notification - //void set_value_at_thread_exit(const R& r); // NOT YET IMPLEMENTED - //void set_value_at_thread_exit(see below); // NOT YET IMPLEMENTED - //void set_exception_at_thread_exit(exception_ptr p); // NOT YET IMPLEMENTED + void set_value_at_thread_exit(R& r) + { + if (future_.get()==0) + { + boost::throw_exception(promise_moved()); + } + future_->set_value_at_thread_exit(r); + } + + void set_exception_at_thread_exit(exception_ptr e) + { + if (future_.get()==0) + { + boost::throw_exception(promise_moved()); + } + future_->set_exception_at_thread_exit(e); + } + template <typename E> + void set_exception_at_thread_exit(E ex) + { + set_exception_at_thread_exit(copy_exception(ex)); + } template<typename F> void set_wait_callback(F f) @@ -1237,22 +2382,21 @@ namespace boost } }; - template <> class promise<void> { - typedef boost::shared_ptr<detail::future_object<void> > future_ptr; + typedef boost::shared_ptr<detail::shared_state<void> > future_ptr; future_ptr future_; bool future_obtained; void lazy_init() { -#if defined BOOST_THREAD_PROMISE_LAZY +#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY if(!atomic_load(&future_)) { future_ptr blank; - atomic_compare_exchange(&future_,&blank,future_ptr(new detail::future_object<void>)); + atomic_compare_exchange(&future_,&blank,future_ptr(new detail::shared_state<void>)); } #endif } @@ -1263,19 +2407,19 @@ namespace boost template <class Allocator> promise(boost::allocator_arg_t, Allocator a) { - typedef typename Allocator::template rebind<detail::future_object<void> >::other A2; + typedef typename Allocator::template rebind<detail::shared_state<void> >::other A2; A2 a2(a); typedef thread_detail::allocator_destructor<A2> D; - future_ = future_ptr(::new(a2.allocate(1)) detail::future_object<void>(), D(a2, 1) ); + future_ = future_ptr(::new(a2.allocate(1)) detail::shared_state<void>(), D(a2, 1) ); future_obtained = false; } #endif promise(): -#if defined BOOST_THREAD_PROMISE_LAZY +#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY future_(), #else - future_(new detail::future_object<void>), + future_(new detail::shared_state<void>), #endif future_obtained(false) {} @@ -1284,11 +2428,11 @@ namespace boost { if(future_) { - boost::lock_guard<boost::mutex> lock(future_->mutex); + boost::unique_lock<boost::mutex> lock(future_->mutex); - if(!future_->done) + if(!future_->done && !future_->is_constructed) { - future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise())); + future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise()), lock); } } } @@ -1331,29 +2475,59 @@ namespace boost boost::throw_exception(future_already_retrieved()); } future_obtained=true; + //return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<void>(future_)); return BOOST_THREAD_FUTURE<void>(future_); } void set_value() { lazy_init(); - boost::lock_guard<boost::mutex> lock(future_->mutex); + boost::unique_lock<boost::mutex> lock(future_->mutex); if(future_->done) { boost::throw_exception(promise_already_satisfied()); } - future_->mark_finished_with_result_internal(); + future_->mark_finished_with_result_internal(lock); } void set_exception(boost::exception_ptr p) { lazy_init(); - boost::lock_guard<boost::mutex> lock(future_->mutex); + boost::unique_lock<boost::mutex> lock(future_->mutex); if(future_->done) { boost::throw_exception(promise_already_satisfied()); } - future_->mark_exceptional_finish_internal(p); + future_->mark_exceptional_finish_internal(p,lock); + } + template <typename E> + void set_exception(E ex) + { + set_exception(copy_exception(ex)); + } + + // setting the result with deferred notification + void set_value_at_thread_exit() + { + if (future_.get()==0) + { + boost::throw_exception(promise_moved()); + } + future_->set_value_at_thread_exit(); + } + + void set_exception_at_thread_exit(exception_ptr e) + { + if (future_.get()==0) + { + boost::throw_exception(promise_moved()); + } + future_->set_exception_at_thread_exit(e); + } + template <typename E> + void set_exception_at_thread_exit(E ex) + { + set_exception_at_thread_exit(copy_exception(ex)); } template<typename F> @@ -1364,28 +2538,50 @@ namespace boost } }; - +} #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS - namespace container +namespace boost { namespace container { + template <class R, class Alloc> + struct uses_allocator< ::boost::promise<R> , Alloc> : true_type { - template <class R, class Alloc> - struct uses_allocator<promise<R> , Alloc> : true_type - { - }; - } + }; +}} +#if ! defined BOOST_NO_CXX11_ALLOCATOR +namespace std { + template <class R, class Alloc> + struct uses_allocator< ::boost::promise<R> , Alloc> : true_type + { + }; +} +#endif #endif +namespace boost +{ + BOOST_THREAD_DCL_MOVABLE_BEG(T) promise<T> BOOST_THREAD_DCL_MOVABLE_END namespace detail { - template<typename R> - struct task_base: - detail::future_object<R> +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + template<typename R> + struct task_base_shared_state; +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template<typename R, typename ...ArgTypes> + struct task_base_shared_state<R(ArgTypes...)>: +#else + template<typename R> + struct task_base_shared_state<R()>: +#endif +#else + template<typename R> + struct task_base_shared_state: +#endif + detail::shared_state<R> { bool started; - task_base(): + task_base_shared_state(): started(false) {} @@ -1393,7 +2589,13 @@ namespace boost { started=false; } +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + virtual void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args)=0; + void run(BOOST_THREAD_RV_REF(ArgTypes) ... args) +#else + virtual void do_run()=0; void run() +#endif { { boost::lock_guard<boost::mutex> lk(this->mutex); @@ -1403,56 +2605,213 @@ namespace boost } started=true; } +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + do_run(boost::forward<ArgTypes>(args)...); +#else do_run(); +#endif + } + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + virtual void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args)=0; + void apply(BOOST_THREAD_RV_REF(ArgTypes) ... args) +#else + virtual void do_apply()=0; + void apply() +#endif + { + { + boost::lock_guard<boost::mutex> lk(this->mutex); + if(started) + { + boost::throw_exception(task_already_started()); + } + started=true; + } +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + do_apply(boost::forward<ArgTypes>(args)...); +#else + do_apply(); +#endif } void owner_destroyed() { - boost::lock_guard<boost::mutex> lk(this->mutex); + boost::unique_lock<boost::mutex> lk(this->mutex); if(!started) { started=true; - this->mark_exceptional_finish_internal(boost::copy_exception(boost::broken_promise())); + this->mark_exceptional_finish_internal(boost::copy_exception(boost::broken_promise()), lk); } } - - virtual void do_run()=0; }; +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + template<typename F, typename R> + struct task_shared_state; +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template<typename F, typename R, typename ...ArgTypes> + struct task_shared_state<F, R(ArgTypes...)>: + task_base_shared_state<R(ArgTypes...)> +#else + template<typename F, typename R> + struct task_shared_state<F, R()>: + task_base_shared_state<R()> +#endif +#else + template<typename F, typename R> + struct task_shared_state: + task_base_shared_state<R> +#endif + { + private: + task_shared_state(task_shared_state&); + public: + F f; + task_shared_state(F const& f_): + f(f_) + {} + task_shared_state(BOOST_THREAD_RV_REF(F) f_): + f(boost::move(f_)) + {} +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + this->set_value_at_thread_exit(f(boost::forward<ArgTypes>(args)...)); + } +#else + void do_apply() + { + try + { + this->set_value_at_thread_exit(f()); + } +#endif +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + this->set_interrupted_at_thread_exit(); + } +#endif + catch(...) + { + this->set_exception_at_thread_exit(current_exception()); + } + } +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + this->mark_finished_with_result(f(boost::forward<ArgTypes>(args)...)); + } +#else + void do_run() + { + try + { +#if ! defined BOOST_NO_CXX11_RVALUE_REFERENCES + R res((f())); + this->mark_finished_with_result(boost::move(res)); +#else + this->mark_finished_with_result(f()); +#endif + } +#endif +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + this->mark_interrupted_finish(); + } +#endif + catch(...) + { + this->mark_exceptional_finish(); + } + } + }; - template<typename R,typename F> - struct task_object: - task_base<R> +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template<typename F, typename R, typename ...ArgTypes> + struct task_shared_state<F, R&(ArgTypes...)>: + task_base_shared_state<R&(ArgTypes...)> +#else + template<typename F, typename R> + struct task_shared_state<F, R&()>: + task_base_shared_state<R&()> +#endif +#else + template<typename F, typename R> + struct task_shared_state<F,R&>: + task_base_shared_state<R&> +#endif { private: - task_object(task_object&); + task_shared_state(task_shared_state&); public: F f; - task_object(F const& f_): + task_shared_state(F const& f_): f(f_) {} -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES - task_object(BOOST_THREAD_RV_REF(F) f_): - f(boost::forward<F>(f_)) - {} -#else - task_object(BOOST_THREAD_RV_REF(F) f_): + task_shared_state(BOOST_THREAD_RV_REF(F) f_): f(boost::move(f_)) {} + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + this->set_value_at_thread_exit(f(boost::forward<ArgTypes>(args)...)); + } +#else + void do_apply() + { + try + { + this->set_value_at_thread_exit(f()); + } +#endif +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + this->set_interrupted_at_thread_exit(); + } #endif + catch(...) + { + this->set_exception_at_thread_exit(current_exception()); + } + } + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + this->mark_finished_with_result(f(boost::forward<ArgTypes>(args)...)); + } +#else void do_run() { try { - this->mark_finished_with_result(f()); + R& res((f())); + this->mark_finished_with_result(res); } +#endif +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS catch(thread_interrupted& ) { this->mark_interrupted_finish(); } +#endif catch(...) { this->mark_exceptional_finish(); @@ -1460,66 +2819,258 @@ namespace boost } }; - template<typename R> - struct task_object<R,R (*)()>: - task_base<R> +#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template<typename R, typename ...ArgTypes> + struct task_shared_state<R (*)(ArgTypes...), R(ArgTypes...)>: + task_base_shared_state<R(ArgTypes...)> +#else + template<typename R> + struct task_shared_state<R (*)(), R()>: + task_base_shared_state<R()> +#endif +#else + template<typename R> + struct task_shared_state<R (*)(), R> : + task_base_shared_state<R> +#endif { private: - task_object(task_object&); + task_shared_state(task_shared_state&); public: +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + R (*f)(BOOST_THREAD_RV_REF(ArgTypes) ... ); + task_shared_state(R (*f_)(BOOST_THREAD_RV_REF(ArgTypes) ... )): + f(f_) + {} +#else R (*f)(); - task_object(R (*f_)()): + task_shared_state(R (*f_)()): f(f_) {} +#endif + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + this->set_value_at_thread_exit(f(boost::forward<ArgTypes>(args)...)); + } +#else + void do_apply() + { + try + { + R r((f())); + this->set_value_at_thread_exit(boost::move(r)); + } +#endif +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + this->set_interrupted_at_thread_exit(); + } +#endif + catch(...) + { + this->set_exception_at_thread_exit(current_exception()); + } + } + + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + this->mark_finished_with_result(f(boost::forward<ArgTypes>(args)...)); + } +#else void do_run() { try { - this->mark_finished_with_result(f()); + R res((f())); + this->mark_finished_with_result(boost::move(res)); } +#endif +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS catch(thread_interrupted& ) { this->mark_interrupted_finish(); } +#endif catch(...) { this->mark_exceptional_finish(); } } }; +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template<typename R, typename ...ArgTypes> + struct task_shared_state<R& (*)(ArgTypes...), R&(ArgTypes...)>: + task_base_shared_state<R&(ArgTypes...)> +#else + template<typename R> + struct task_shared_state<R& (*)(), R&()>: + task_base_shared_state<R&()> +#endif +#else + template<typename R> + struct task_shared_state<R& (*)(), R&> : + task_base_shared_state<R&> +#endif + { + private: + task_shared_state(task_shared_state&); + public: +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + R& (*f)(BOOST_THREAD_RV_REF(ArgTypes) ... ); + task_shared_state(R& (*f_)(BOOST_THREAD_RV_REF(ArgTypes) ... )): + f(f_) + {} +#else + R& (*f)(); + task_shared_state(R& (*f_)()): + f(f_) + {} +#endif + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + this->set_value_at_thread_exit(f(boost::forward<ArgTypes>(args)...)); + } +#else + void do_apply() + { + try + { + this->set_value_at_thread_exit(f()); + } +#endif +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + this->set_interrupted_at_thread_exit(); + } +#endif + catch(...) + { + this->set_exception_at_thread_exit(current_exception()); + } + } + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + this->mark_finished_with_result(f(boost::forward<ArgTypes>(args)...)); + } +#else + void do_run() + { + try + { + this->mark_finished_with_result(f()); + } +#endif +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + this->mark_interrupted_finish(); + } +#endif + catch(...) + { + this->mark_exceptional_finish(); + } + } + }; +#endif +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template<typename F, typename ...ArgTypes> + struct task_shared_state<F, void(ArgTypes...)>: + task_base_shared_state<void(ArgTypes...)> +#else + template<typename F> + struct task_shared_state<F, void()>: + task_base_shared_state<void()> +#endif +#else template<typename F> - struct task_object<void,F>: - task_base<void> + struct task_shared_state<F,void>: + task_base_shared_state<void> +#endif { private: - task_object(task_object&); + task_shared_state(task_shared_state&); public: F f; - task_object(F const& f_): + task_shared_state(F const& f_): f(f_) {} -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES - task_object(BOOST_THREAD_RV_REF(F) f_): - f(boost::forward<F>(f_)) - {} -#else - task_object(BOOST_THREAD_RV_REF(F) f_): + task_shared_state(BOOST_THREAD_RV_REF(F) f_): f(boost::move(f_)) {} + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + f(boost::forward<ArgTypes>(args)...); +#else + void do_apply() + { + try + { + f(); #endif + this->set_value_at_thread_exit(); + } +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + this->set_interrupted_at_thread_exit(); + } +#endif + catch(...) + { + this->set_exception_at_thread_exit(current_exception()); + } + } +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + f(boost::forward<ArgTypes>(args)...); +#else void do_run() { try { f(); +#endif this->mark_finished_with_result(); } +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS catch(thread_interrupted& ) { this->mark_interrupted_finish(); } +#endif catch(...) { this->mark_exceptional_finish(); @@ -1527,43 +3078,109 @@ namespace boost } }; +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template<typename ...ArgTypes> + struct task_shared_state<void (*)(ArgTypes...), void(ArgTypes...)>: + task_base_shared_state<void(ArgTypes...)> +#else template<> - struct task_object<void,void (*)()>: - task_base<void> + struct task_shared_state<void (*)(), void()>: + task_base_shared_state<void()> +#endif +#else + template<> + struct task_shared_state<void (*)(),void>: + task_base_shared_state<void> +#endif { private: - task_object(task_object&); + task_shared_state(task_shared_state&); public: void (*f)(); - task_object(void (*f_)()): + task_shared_state(void (*f_)()): f(f_) {} + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + f(boost::forward<ArgTypes>(args)...); +#else + void do_apply() + { + try + { + f(); +#endif + this->set_value_at_thread_exit(); + } +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + catch(thread_interrupted& ) + { + this->set_interrupted_at_thread_exit(); + } +#endif + catch(...) + { + this->set_exception_at_thread_exit(current_exception()); + } + } + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args) + { + try + { + f(boost::forward<ArgTypes>(args)...); +#else void do_run() { try { f(); +#endif this->mark_finished_with_result(); } +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS catch(thread_interrupted& ) { this->mark_interrupted_finish(); } +#endif catch(...) { this->mark_exceptional_finish(); } } }; - } +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template<typename R, typename ...ArgTypes> + class packaged_task<R(ArgTypes...)> + { + typedef boost::shared_ptr<detail::task_base_shared_state<R(ArgTypes...)> > task_ptr; + boost::shared_ptr<detail::task_base_shared_state<R(ArgTypes...)> > task; + #else + template<typename R> + class packaged_task<R()> + { + typedef boost::shared_ptr<detail::task_base_shared_state<R()> > task_ptr; + boost::shared_ptr<detail::task_base_shared_state<R()> > task; + #endif +#else template<typename R> class packaged_task { - typedef boost::shared_ptr<detail::task_base<R> > task_ptr; - boost::shared_ptr<detail::task_base<R> > task; + typedef boost::shared_ptr<detail::task_base_shared_state<R> > task_ptr; + boost::shared_ptr<detail::task_base_shared_state<R> > task; +#endif bool future_obtained; + struct dummy; public: typedef R result_type; @@ -1574,294 +3191,1646 @@ namespace boost {} // construction and destruction +#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) - explicit packaged_task(R(*f)()): - task(new detail::task_object<R,R(*)()>(f)),future_obtained(false) - {} +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + explicit packaged_task(R(*f)(), BOOST_THREAD_FWD_REF(ArgTypes)... args) + { + typedef R(*FR)(BOOST_THREAD_FWD_REF(ArgTypes)...); + typedef detail::task_shared_state<FR,R(ArgTypes...)> task_shared_state_type; + task= task_ptr(new task_shared_state_type(f, boost::forward<ArgTypes>(args)...)); + future_obtained=false; + } + #else + explicit packaged_task(R(*f)()) + { + typedef R(*FR)(); + typedef detail::task_shared_state<FR,R()> task_shared_state_type; + task= task_ptr(new task_shared_state_type(f)); + future_obtained=false; + } + #endif +#else + explicit packaged_task(R(*f)()) + { + typedef R(*FR)(); + typedef detail::task_shared_state<FR,R> task_shared_state_type; + task= task_ptr(new task_shared_state_type(f)); + future_obtained=false; + } +#endif +#endif #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES template <class F> - explicit packaged_task(BOOST_THREAD_RV_REF(F) f): - task(new detail::task_object<R, - typename remove_cv<typename remove_reference<F>::type>::type - >(boost::forward<F>(f))),future_obtained(false) - {} + explicit packaged_task(BOOST_THREAD_FWD_REF(F) f + , typename boost::disable_if<is_same<typename decay<F>::type, packaged_task>, dummy* >::type=0 + ) + { + //typedef typename remove_cv<typename remove_reference<F>::type>::type FR; + typedef typename decay<F>::type FR; +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + typedef detail::task_shared_state<FR,R(ArgTypes...)> task_shared_state_type; + #else + typedef detail::task_shared_state<FR,R()> task_shared_state_type; + #endif +#else + typedef detail::task_shared_state<FR,R> task_shared_state_type; +#endif + task = task_ptr(new task_shared_state_type(boost::forward<F>(f))); + future_obtained = false; + + } + #else template <class F> - explicit packaged_task(F const& f): - task(new detail::task_object<R,F>(f)),future_obtained(false) - {} + explicit packaged_task(F const& f + , typename boost::disable_if<is_same<typename decay<F>::type, packaged_task>, dummy* >::type=0 + ) + { +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + typedef detail::task_shared_state<F,R(ArgTypes...)> task_shared_state_type; + #else + typedef detail::task_shared_state<F,R()> task_shared_state_type; + #endif +#else + typedef detail::task_shared_state<F,R> task_shared_state_type; +#endif + task = task_ptr(new task_shared_state_type(f)); + future_obtained=false; + } template <class F> - explicit packaged_task(BOOST_THREAD_RV_REF(F) f): - task(new detail::task_object<R,F>(boost::move(f))),future_obtained(false) - {} + explicit packaged_task(BOOST_THREAD_RV_REF(F) f) + { +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + typedef detail::task_shared_state<F,R(ArgTypes...)> task_shared_state_type; + task = task_ptr(new task_shared_state_type(boost::forward<F>(f))); +#else + typedef detail::task_shared_state<F,R()> task_shared_state_type; + task = task_ptr(new task_shared_state_type(boost::move(f))); // TODO forward +#endif +#else + typedef detail::task_shared_state<F,R> task_shared_state_type; + task = task_ptr(new task_shared_state_type(boost::forward<F>(f))); +#endif + future_obtained=false; + + } #endif #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS +#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) template <class Allocator> packaged_task(boost::allocator_arg_t, Allocator a, R(*f)()) { typedef R(*FR)(); - typedef typename Allocator::template rebind<detail::task_object<R,FR> >::other A2; +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + typedef detail::task_shared_state<FR,R(ArgTypes...)> task_shared_state_type; + #else + typedef detail::task_shared_state<FR,R()> task_shared_state_type; + #endif +#else + typedef detail::task_shared_state<FR,R> task_shared_state_type; +#endif + typedef typename Allocator::template rebind<task_shared_state_type>::other A2; A2 a2(a); typedef thread_detail::allocator_destructor<A2> D; - task = task_ptr(::new(a2.allocate(1)) detail::task_object<R,FR>(f), D(a2, 1) ); + task = task_ptr(::new(a2.allocate(1)) task_shared_state_type(f), D(a2, 1) ); future_obtained = false; } -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES +#endif // BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR + +#if ! defined BOOST_NO_CXX11_RVALUE_REFERENCES template <class F, class Allocator> - packaged_task(boost::allocator_arg_t, Allocator a, BOOST_THREAD_RV_REF(F) f) + packaged_task(boost::allocator_arg_t, Allocator a, BOOST_THREAD_FWD_REF(F) f) { - typedef typename remove_cv<typename remove_reference<F>::type>::type FR; - typedef typename Allocator::template rebind<detail::task_object<R,FR> >::other A2; + //typedef typename remove_cv<typename remove_reference<F>::type>::type FR; + typedef typename decay<F>::type FR; + +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + typedef detail::task_shared_state<FR,R(ArgTypes...)> task_shared_state_type; + #else + typedef detail::task_shared_state<FR,R()> task_shared_state_type; + #endif +#else + typedef detail::task_shared_state<FR,R> task_shared_state_type; +#endif + typedef typename Allocator::template rebind<task_shared_state_type>::other A2; A2 a2(a); typedef thread_detail::allocator_destructor<A2> D; - task = task_ptr(::new(a2.allocate(1)) detail::task_object<R,FR>(boost::forward<F>(f)), D(a2, 1) ); + task = task_ptr(::new(a2.allocate(1)) task_shared_state_type(boost::forward<F>(f)), D(a2, 1) ); future_obtained = false; } -#else +#else // ! defined BOOST_NO_CXX11_RVALUE_REFERENCES template <class F, class Allocator> packaged_task(boost::allocator_arg_t, Allocator a, const F& f) { - typedef typename Allocator::template rebind<detail::task_object<R,F> >::other A2; +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + typedef detail::task_shared_state<F,R(ArgTypes...)> task_shared_state_type; + #else + typedef detail::task_shared_state<F,R()> task_shared_state_type; + #endif +#else + typedef detail::task_shared_state<F,R> task_shared_state_type; +#endif + typedef typename Allocator::template rebind<task_shared_state_type>::other A2; A2 a2(a); typedef thread_detail::allocator_destructor<A2> D; - task = task_ptr(::new(a2.allocate(1)) detail::task_object<R,F>(f), D(a2, 1) ); + task = task_ptr(::new(a2.allocate(1)) task_shared_state_type(f), D(a2, 1) ); future_obtained = false; } template <class F, class Allocator> packaged_task(boost::allocator_arg_t, Allocator a, BOOST_THREAD_RV_REF(F) f) { - typedef typename Allocator::template rebind<detail::task_object<R,F> >::other A2; +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + typedef detail::task_shared_state<F,R(ArgTypes...)> task_shared_state_type; + #else + typedef detail::task_shared_state<F,R()> task_shared_state_type; + #endif +#else + typedef detail::task_shared_state<F,R> task_shared_state_type; +#endif + typedef typename Allocator::template rebind<task_shared_state_type>::other A2; A2 a2(a); typedef thread_detail::allocator_destructor<A2> D; - task = task_ptr(::new(a2.allocate(1)) detail::task_object<R,F>(boost::move(f)), D(a2, 1) ); +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + task = task_ptr(::new(a2.allocate(1)) task_shared_state_type(boost::forward<F>(f)), D(a2, 1) ); +#else + task = task_ptr(::new(a2.allocate(1)) task_shared_state_type(boost::move(f)), D(a2, 1) ); // TODO forward +#endif future_obtained = false; } + #endif //BOOST_NO_CXX11_RVALUE_REFERENCES #endif // BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS - ~packaged_task() - { - if(task) - { + ~packaged_task() { + if(task) { task->owner_destroyed(); } } // assignment - packaged_task(BOOST_THREAD_RV_REF(packaged_task) other) BOOST_NOEXCEPT : - future_obtained(BOOST_THREAD_RV(other).future_obtained) - { + packaged_task(BOOST_THREAD_RV_REF(packaged_task) other) BOOST_NOEXCEPT + : future_obtained(BOOST_THREAD_RV(other).future_obtained) { task.swap(BOOST_THREAD_RV(other).task); BOOST_THREAD_RV(other).future_obtained=false; } - packaged_task& operator=(BOOST_THREAD_RV_REF(packaged_task) other) BOOST_NOEXCEPT - { + packaged_task& operator=(BOOST_THREAD_RV_REF(packaged_task) other) BOOST_NOEXCEPT { + + // todo use forward +#if ! defined BOOST_NO_CXX11_RVALUE_REFERENCES + packaged_task temp(boost::move(other)); +#else packaged_task temp(static_cast<BOOST_THREAD_RV_REF(packaged_task)>(other)); +#endif swap(temp); return *this; } - void reset() - { + void reset() { if (!valid()) throw future_error(system::make_error_code(future_errc::no_state)); task->reset(); future_obtained=false; } - void swap(packaged_task& other) BOOST_NOEXCEPT - { + void swap(packaged_task& other) BOOST_NOEXCEPT { task.swap(other.task); std::swap(future_obtained,other.future_obtained); } - bool valid() const BOOST_NOEXCEPT - { + bool valid() const BOOST_NOEXCEPT { return task.get()!=0; } // result retrieval - BOOST_THREAD_FUTURE<R> get_future() - { - if(!task) - { + BOOST_THREAD_FUTURE<R> get_future() { + if(!task) { boost::throw_exception(task_moved()); - } - else if(!future_obtained) - { + } else if(!future_obtained) { future_obtained=true; return BOOST_THREAD_FUTURE<R>(task); - } - else - { + } else { boost::throw_exception(future_already_retrieved()); } - return BOOST_THREAD_FUTURE<R>(); - } - // execution - void operator()() - { - if(!task) - { +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + void operator()(BOOST_THREAD_RV_REF(ArgTypes)... args) { + if(!task) { + boost::throw_exception(task_moved()); + } + task->run(boost::forward<ArgTypes>(args)...); + } + void make_ready_at_thread_exit(ArgTypes... args) { + if(!task) { + boost::throw_exception(task_moved()); + } + if (task->has_value()) { + boost::throw_exception(promise_already_satisfied()); + } + task->apply(boost::forward<ArgTypes>(args)...); + } +#else + void operator()() { + if(!task) { boost::throw_exception(task_moved()); } task->run(); } - + void make_ready_at_thread_exit() { + if(!task) { + boost::throw_exception(task_moved()); + } + if (task->has_value()) boost::throw_exception(promise_already_satisfied()); + task->apply(); + } +#endif template<typename F> - void set_wait_callback(F f) - { + void set_wait_callback(F f) { task->set_wait_callback(f,this); } - }; - +} #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS - namespace container - { - template <class R, class Alloc> - struct uses_allocator<packaged_task<R>, Alloc> - : public true_type {}; - } +namespace boost { namespace container { + template <class R, class Alloc> + struct uses_allocator< ::boost::packaged_task<R> , Alloc> : true_type + {}; +}} +#if ! defined BOOST_NO_CXX11_ALLOCATOR +namespace std { + template <class R, class Alloc> + struct uses_allocator< ::boost::packaged_task<R> , Alloc> : true_type + {}; +} +#endif #endif - BOOST_THREAD_DCL_MOVABLE_BEG(T) packaged_task<T> BOOST_THREAD_DCL_MOVABLE_END +namespace boost +{ + BOOST_THREAD_DCL_MOVABLE_BEG(T) packaged_task<T> BOOST_THREAD_DCL_MOVABLE_END +namespace detail +{ + //////////////////////////////// + // make_future_deferred_shared_state + //////////////////////////////// + template <class Rp, class Fp> + BOOST_THREAD_FUTURE<Rp> + make_future_deferred_shared_state(BOOST_THREAD_FWD_REF(Fp) f) { + shared_ptr<future_deferred_shared_state<Rp, Fp> > + h(new future_deferred_shared_state<Rp, Fp>(boost::forward<Fp>(f))); + return BOOST_THREAD_FUTURE<Rp>(h); + } - template <class R> - BOOST_THREAD_FUTURE<R> - async(launch policy, R(*f)()) - { - if (int(policy) & int(launch::async)) - { - packaged_task<R> pt( f ); + //////////////////////////////// + // make_future_async_shared_state + //////////////////////////////// + template <class Rp, class Fp> + BOOST_THREAD_FUTURE<Rp> + make_future_async_shared_state(BOOST_THREAD_FWD_REF(Fp) f) { + shared_ptr<future_async_shared_state<Rp, Fp> > + h(new future_async_shared_state<Rp, Fp>(boost::forward<Fp>(f))); + return BOOST_THREAD_FUTURE<Rp>(h); + } +} - BOOST_THREAD_FUTURE<R> ret = pt.get_future(); - boost::thread( boost::move(pt) ).detach(); - return ::boost::move(ret); - } - else if (int(policy) & int(launch::deferred)) - { - packaged_task<R> pt( f ); + //////////////////////////////// + // template <class F, class... ArgTypes> + // future<R> async(launch policy, F&&, ArgTypes&&...); + //////////////////////////////// + +#if defined BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR + +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template <class R, class... ArgTypes> + BOOST_THREAD_FUTURE<R> + async(launch policy, R(*f)(BOOST_THREAD_FWD_REF(ArgTypes)...), BOOST_THREAD_FWD_REF(ArgTypes)... args) { + typedef R(*F)(BOOST_THREAD_FWD_REF(ArgTypes)...); + typedef detail::invoker<typename decay<F>::type, typename decay<ArgTypes>::type...> BF; + typedef typename BF::result_type Rp; + + if (underlying_cast<int>(policy) & int(launch::async)) { + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_async_shared_state<Rp>( + BF( + thread_detail::decay_copy(boost::forward<F>(f)) + , thread_detail::decay_copy(boost::forward<ArgTypes>(args))... + ) + )); + } else if (underlying_cast<int>(policy) & int(launch::deferred)) { + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_deferred_shared_state<Rp>( + BF( + thread_detail::decay_copy(boost::forward<F>(f)) + , thread_detail::decay_copy(boost::forward<ArgTypes>(args))... + ) + )); + } else { + std::terminate(); + BOOST_THREAD_FUTURE<R> ret; + return ::boost::move(ret); + } + } - BOOST_THREAD_FUTURE<R> ret = pt.get_future(); - return ::boost::move(ret); - } else { - BOOST_THREAD_FUTURE<R> ret; - return ::boost::move(ret); - } - } +#else // defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + + template <class R> + BOOST_THREAD_FUTURE<R> + async(launch policy, R(*f)()) { + #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + typedef packaged_task<R()> packaged_task_type; + #else + typedef packaged_task<R> packaged_task_type; + #endif + + if (underlying_cast<int>(policy) & int(launch::async)) { + packaged_task_type pt( f ); + BOOST_THREAD_FUTURE<R> ret = BOOST_THREAD_MAKE_RV_REF(pt.get_future()); + ret.set_async(); + boost::thread( boost::move(pt) ).detach(); + return ::boost::move(ret); + } else if (underlying_cast<int>(policy) & int(launch::deferred)) { + std::terminate(); + BOOST_THREAD_FUTURE<R> ret; + return ::boost::move(ret); + } else { + std::terminate(); + BOOST_THREAD_FUTURE<R> ret; + return ::boost::move(ret); + } + } +#endif +#endif // defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) + +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + + template <class F, class ...ArgTypes> + BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type( + typename decay<ArgTypes>::type... + )>::type> + async(launch policy, BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(ArgTypes)... args) { + typedef typename boost::result_of<typename decay<F>::type( + typename decay<ArgTypes>::type... + )>::type R; + typedef detail::invoker<typename decay<F>::type, typename decay<ArgTypes>::type...> BF; + typedef typename BF::result_type Rp; + + if (underlying_cast<int>(policy) & int(launch::async)) { + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_async_shared_state<Rp>( + BF( + thread_detail::decay_copy(boost::forward<F>(f)) + , thread_detail::decay_copy(boost::forward<ArgTypes>(args))... + ) + )); + } else if (underlying_cast<int>(policy) & int(launch::deferred)) { + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_deferred_shared_state<Rp>( + BF( + thread_detail::decay_copy(boost::forward<F>(f)) + , thread_detail::decay_copy(boost::forward<ArgTypes>(args))... + ) + )); + } else { + std::terminate(); + BOOST_THREAD_FUTURE<R> ret; + return ::boost::move(ret); + } + } - template <class R> - BOOST_THREAD_FUTURE<R> - async(R(*f)()) - { - return async(launch::any, f); - } -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES - template <class F> - BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type> - async(launch policy, BOOST_THREAD_FWD_REF(F) f) +#else // defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + + template <class F> + BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type> + async(launch policy, BOOST_THREAD_FWD_REF(F) f) { + typedef typename boost::result_of<typename decay<F>::type()>::type R; +#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + typedef packaged_task<R()> packaged_task_type; +#else // defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + typedef packaged_task<R> packaged_task_type; +#endif // defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK + + if (underlying_cast<int>(policy) & int(launch::async)) { + packaged_task_type pt( boost::forward<F>(f) ); + BOOST_THREAD_FUTURE<R> ret = pt.get_future(); + ret.set_async(); + boost::thread( boost::move(pt) ).detach(); + return ::boost::move(ret); + } else if (underlying_cast<int>(policy) & int(launch::deferred)) { + std::terminate(); + BOOST_THREAD_FUTURE<R> ret; + return ::boost::move(ret); + // return boost::detail::make_future_deferred_shared_state<Rp>( + // BF( + // thread_detail::decay_copy(boost::forward<F>(f)) + // ) + // ); + } else { + std::terminate(); + BOOST_THREAD_FUTURE<R> ret; + return ::boost::move(ret); + } + } +#endif // defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + +#ifdef BOOST_THREAD_PROVIDES_EXECUTORS +namespace detail { + ///////////////////////// + /// shared_state_nullary_task + ///////////////////////// + template<typename Rp, typename Fp> + struct shared_state_nullary_task { - typedef typename boost::result_of<typename decay<F>::type()>::type R; - if (int(policy) & int(launch::async)) - { - packaged_task<R> pt( boost::forward<F>(f) ); + shared_state<Rp>* that; + Fp f_; + public: - BOOST_THREAD_FUTURE<R> ret = pt.get_future(); - boost::thread( boost::move(pt) ).detach(); - return ::boost::move(ret); + shared_state_nullary_task(shared_state<Rp>* st, BOOST_THREAD_FWD_REF(Fp) f) + : that(st), f_(boost::forward<Fp>(f)) + {}; +#if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + BOOST_THREAD_MOVABLE(shared_state_nullary_task) + shared_state_nullary_task(shared_state_nullary_task const& x) //BOOST_NOEXCEPT + : that(x.that), f_(x.f_) + {} + shared_state_nullary_task& operator=(BOOST_COPY_ASSIGN_REF(shared_state_nullary_task) x) //BOOST_NOEXCEPT + { + if (this != &x) { + that=x.that; + f_=x.f_; } - else if (int(policy) & int(launch::deferred)) - { - packaged_task<R> pt( boost::forward<F>(f) ); + return *this; + } + // move + shared_state_nullary_task(BOOST_THREAD_RV_REF(shared_state_nullary_task) x) //BOOST_NOEXCEPT + : that(x.that), f_(boost::move(x.f_)) + { + x.that=0; + } + shared_state_nullary_task& operator=(BOOST_THREAD_RV_REF(shared_state_nullary_task) x) //BOOST_NOEXCEPT + { + if (this != &x) { + that=x.that; + f_=boost::move(x.f_); + x.that=0; + } + return *this; + } +#endif + void operator()() { + try { + that->mark_finished_with_result(f_()); +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(thread_interrupted& ) { + that->mark_interrupted_finish(); +#endif // defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(...) { + that->mark_exceptional_finish(); + } + + } + }; - BOOST_THREAD_FUTURE<R> ret = pt.get_future(); - return ::boost::move(ret); - } else { - BOOST_THREAD_FUTURE<R> ret; - return ::boost::move(ret); + template<typename Fp> + struct shared_state_nullary_task<void, Fp> + { + shared_state<void>* that; + Fp f_; + public: + shared_state_nullary_task(shared_state<void>* st, BOOST_THREAD_FWD_REF(Fp) f) + : that(st), f_(boost::forward<Fp>(f)) + {}; +#if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + BOOST_THREAD_MOVABLE(shared_state_nullary_task) + shared_state_nullary_task(shared_state_nullary_task const& x) //BOOST_NOEXCEPT + : that(x.that), f_(x.f_) + {} + shared_state_nullary_task& operator=(BOOST_COPY_ASSIGN_REF(shared_state_nullary_task) x) //BOOST_NOEXCEPT + { + if (this != &x) { + that=x.that; + f_=x.f_; } - } - template <class F> - BOOST_THREAD_FUTURE<typename boost::result_of<F()>::type> - async(BOOST_THREAD_RV_REF(F) f) + return *this; + } + // move + shared_state_nullary_task(BOOST_THREAD_RV_REF(shared_state_nullary_task) x) BOOST_NOEXCEPT + : that(x.that), f_(boost::move(x.f_)) + { + x.that=0; + } + shared_state_nullary_task& operator=(BOOST_THREAD_RV_REF(shared_state_nullary_task) x) BOOST_NOEXCEPT { + if (this != &x) { + that=x.that; + f_=boost::move(x.f_); + x.that=0; + } + return *this; + } +#endif + void operator()() { + try { + f_(); + that->mark_finished_with_result(); +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(thread_interrupted& ) { + that->mark_interrupted_finish(); +#endif // defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(...) { + that->mark_exceptional_finish(); + } + } + }; + + template<typename Rp, typename Fp> + struct shared_state_nullary_task<Rp&, Fp> { - return async(launch::any, boost::forward<F>(f)); + shared_state<Rp&>* that; + Fp f_; + public: + shared_state_nullary_task(shared_state<Rp&>* st, BOOST_THREAD_FWD_REF(Fp) f) + : that(st), f_(boost::forward<Fp>(f)) + {} +#if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + BOOST_THREAD_MOVABLE(shared_state_nullary_task) + shared_state_nullary_task(shared_state_nullary_task const& x) BOOST_NOEXCEPT + : that(x.that), f_(x.f_) {} + + shared_state_nullary_task& operator=(BOOST_COPY_ASSIGN_REF(shared_state_nullary_task) x) BOOST_NOEXCEPT { + if (this != &x){ + that=x.that; + f_=x.f_; + } + return *this; + } + // move + shared_state_nullary_task(BOOST_THREAD_RV_REF(shared_state_nullary_task) x) BOOST_NOEXCEPT + : that(x.that), f_(boost::move(x.f_)) + { + x.that=0; + } + shared_state_nullary_task& operator=(BOOST_THREAD_RV_REF(shared_state_nullary_task) x) BOOST_NOEXCEPT { + if (this != &x) { + that=x.that; + f_=boost::move(x.f_); + x.that=0; + } + return *this; + } +#endif + void operator()() { + try { + that->mark_finished_with_result(f_()); +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(thread_interrupted& ) { + that->mark_interrupted_finish(); +#endif // defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(...) { + that->mark_exceptional_finish(); + } + } + }; + + ///////////////////////// + /// future_executor_shared_state_base + ///////////////////////// + template<typename Rp, typename Executor> + struct future_executor_shared_state: shared_state<Rp> + { + typedef shared_state<Rp> base_type; + protected: + public: + template<typename Fp> + future_executor_shared_state(Executor& ex, BOOST_THREAD_FWD_REF(Fp) f) { + this->set_executor(); + shared_state_nullary_task<Rp,Fp> t(this, boost::forward<Fp>(f)); + ex.submit(boost::move(t)); + } + + ~future_executor_shared_state() { + this->wait(false); + } + }; + + //////////////////////////////// + // make_future_executor_shared_state + //////////////////////////////// + template <class Rp, class Fp, class Executor> + BOOST_THREAD_FUTURE<Rp> + make_future_executor_shared_state(Executor& ex, BOOST_THREAD_FWD_REF(Fp) f) { + shared_ptr<future_executor_shared_state<Rp, Executor> > + h(new future_executor_shared_state<Rp, Executor>(ex, boost::forward<Fp>(f))); + return BOOST_THREAD_FUTURE<Rp>(h); } + +} // detail + + //////////////////////////////// + // template <class Executor, class F, class... ArgTypes> + // future<R> async(Executor& ex, F&&, ArgTypes&&...); + //////////////////////////////// + +#if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) +#if defined BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR + + template <class Executor, class R, class... ArgTypes> + BOOST_THREAD_FUTURE<R> + async(Executor& ex, R(*f)(BOOST_THREAD_FWD_REF(ArgTypes)...), BOOST_THREAD_FWD_REF(ArgTypes)... args) { + typedef R(*F)(BOOST_THREAD_FWD_REF(ArgTypes)...); + typedef detail::invoker<typename decay<F>::type, typename decay<ArgTypes>::type...> BF; + typedef typename BF::result_type Rp; + + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_executor_shared_state<Rp>(ex, + BF( + thread_detail::decay_copy(boost::forward<F>(f)) + , thread_detail::decay_copy(boost::forward<ArgTypes>(args))... + ) + )); + } +#endif // defined BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR + + template <class Executor, class F, class ...ArgTypes> + BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type( + typename decay<ArgTypes>::type... + )>::type> + async(Executor& ex, BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(ArgTypes)... args) { + typedef detail::invoker<typename decay<F>::type, typename decay<ArgTypes>::type...> BF; + typedef typename BF::result_type Rp; + + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_executor_shared_state<Rp>(ex, + BF( + thread_detail::decay_copy(boost::forward<F>(f)) + , thread_detail::decay_copy(boost::forward<ArgTypes>(args))... + ) + )); + } + +// template <class R, class Executor, class F, class ...ArgTypes> +// BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type( +// typename decay<ArgTypes>::type... +// )>::type> +// async(Executor& ex, BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(ArgTypes)... args) { +// typedef detail::invoker_ret<R, typename decay<F>::type, typename decay<ArgTypes>::type...> BF; +// typedef typename BF::result_type Rp; +// +// return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_executor_shared_state<Rp>(ex, +// BF( +// thread_detail::decay_copy(boost::forward<F>(f)) +// , thread_detail::decay_copy(boost::forward<ArgTypes>(args))... +// ) +// )); +// } + +#else // ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) +#if defined BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR + + template <class Executor, class R> + BOOST_THREAD_FUTURE<R> + async(Executor& ex, R(*f)()) { + typedef R(*F)(); + typedef detail::invoker<F> BF; + typedef typename BF::result_type Rp; + + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_executor_shared_state<Rp>(ex, + BF( + f + ) + )); + } + + template <class Executor, class R, class A1> + BOOST_THREAD_FUTURE<R> + async(Executor& ex, R(*f)(BOOST_THREAD_FWD_REF(A1)), BOOST_THREAD_FWD_REF(A1) a1) { + typedef R(*F)(BOOST_THREAD_FWD_REF(A1)); + typedef detail::invoker<F, typename decay<A1>::type> BF; + typedef typename BF::result_type Rp; + + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_executor_shared_state<Rp>(ex, + BF( + f + , thread_detail::decay_copy(boost::forward<A1>(a1)) + ) + )); + } +#endif // defined BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR + + template <class Executor, class F> + BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type> + async(Executor& ex, BOOST_THREAD_FWD_REF(F) f) { + typedef detail::invoker<typename decay<F>::type> BF; + typedef typename BF::result_type Rp; + + return boost::detail::make_future_executor_shared_state<Rp>(ex, + BF( + thread_detail::decay_copy(boost::forward<F>(f)) + ) + ); + } + + template <class Executor, class F, class A1> + BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type( + typename decay<A1>::type + )>::type> + async(Executor& ex, BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(A1) a1) { + typedef detail::invoker<typename decay<F>::type, typename decay<A1>::type> BF; + typedef typename BF::result_type Rp; + + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_executor_shared_state<Rp>(ex, + BF( + thread_detail::decay_copy(boost::forward<F>(f)) + , thread_detail::decay_copy(boost::forward<A1>(a1)) + ) + )); + } + + template <class Executor, class F, class A1, class A2> + BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type( + typename decay<A1>::type, typename decay<A2>::type + )>::type> + async(Executor& ex, BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(A1) a1, BOOST_THREAD_FWD_REF(A2) a2) { + typedef detail::invoker<typename decay<F>::type, typename decay<A1>::type, typename decay<A2>::type> BF; + typedef typename BF::result_type Rp; + + return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_executor_shared_state<Rp>(ex, + BF( + thread_detail::decay_copy(boost::forward<F>(f)) + , thread_detail::decay_copy(boost::forward<A1>(a1)) + , thread_detail::decay_copy(boost::forward<A2>(a2)) + ) + )); + } + +#endif //! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) +#endif + + //////////////////////////////// + // template <class F, class... ArgTypes> + // future<R> async(F&&, ArgTypes&&...); + //////////////////////////////// + +#if defined BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR + #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template <class R, class... ArgTypes> + BOOST_THREAD_FUTURE<R> + async(R(*f)(BOOST_THREAD_FWD_REF(ArgTypes)...), BOOST_THREAD_FWD_REF(ArgTypes)... args) { + return BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), f, boost::forward<ArgTypes>(args)...)); + } + #else + template <class R> + BOOST_THREAD_FUTURE<R> + async(R(*f)()) { + return BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), f)); + } + #endif +#endif + +#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD) + template <class F, class ...ArgTypes> + BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type( + typename decay<ArgTypes>::type... + )>::type> + async(BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(ArgTypes)... args) { + return BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), boost::forward<F>(f), boost::forward<ArgTypes>(args)...)); + } #else + template <class F> + BOOST_THREAD_FUTURE<typename boost::result_of<F()>::type> + async(BOOST_THREAD_RV_REF(F) f) { + return BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), boost::forward<F>(f))); + } +#endif -// template <class F> -// BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type> -// async(launch policy, F const& f) -// { -// typedef typename boost::result_of<typename decay<F>::type()>::type R; -// if (int(policy) & int(launch::async)) -// { -// packaged_task<R> pt( f ); + //////////////////////////////// + // make_future deprecated + //////////////////////////////// + template <typename T> + BOOST_THREAD_FUTURE<typename decay<T>::type> make_future(BOOST_THREAD_FWD_REF(T) value) { + typedef typename decay<T>::type future_value_type; + promise<future_value_type> p; + p.set_value(boost::forward<future_value_type>(value)); + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } + +#if defined BOOST_THREAD_USES_MOVE + inline BOOST_THREAD_FUTURE<void> make_future() { + promise<void> p; + p.set_value(); + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } +#endif + + //////////////////////////////// + // make_ready_future + //////////////////////////////// + template <typename T> + BOOST_THREAD_FUTURE<typename decay<T>::type> make_ready_future(BOOST_THREAD_FWD_REF(T) value) { + typedef typename decay<T>::type future_value_type; + promise<future_value_type> p; + p.set_value(boost::forward<future_value_type>(value)); + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } + + template <typename T, typename T1> + BOOST_THREAD_FUTURE<T> make_ready_no_decay_future(T1 value) { + typedef T future_value_type; + promise<future_value_type> p; + p.set_value(value); + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } + +#if defined BOOST_THREAD_USES_MOVE + inline BOOST_THREAD_FUTURE<void> make_ready_future() { + promise<void> p; + p.set_value(); + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } +#endif + + template <typename T> + BOOST_THREAD_FUTURE<T> make_ready_future(exception_ptr ex) { + promise<T> p; + p.set_exception(ex); + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } +// template <typename T, typename E> +// BOOST_THREAD_FUTURE<T> make_ready_future(E ex) +// { +// promise<T> p; +// p.set_exception(boost::copy_exception(ex)); +// return BOOST_THREAD_MAKE_RV_REF(p.get_future()); +// } + + template <typename T> + BOOST_THREAD_FUTURE<T> make_exceptional_future(exception_ptr ex) { + promise<T> p; + p.set_exception(ex); + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } + + template <typename T, typename E> + BOOST_THREAD_FUTURE<T> make_exceptional_future(E ex) { + promise<T> p; + p.set_exception(boost::copy_exception(ex)); + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } + + template <typename T> + BOOST_THREAD_FUTURE<T> make_exceptional_future() { + promise<T> p; + p.set_exception(boost::current_exception()); + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } + +#if 0 + template<typename CLOSURE> + make_future(CLOSURE closure) -> BOOST_THREAD_FUTURE<decltype(closure())> { + typedef decltype(closure()) T; + promise<T> p; + try { + p.set_value(closure()); + } catch(...) { + p.set_exception(std::current_exception()); + } + return BOOST_THREAD_MAKE_RV_REF(p.get_future()); + } +#endif + + //////////////////////////////// + // make_shared_future deprecated + //////////////////////////////// + template <typename T> + shared_future<typename decay<T>::type> make_shared_future(BOOST_THREAD_FWD_REF(T) value) { + typedef typename decay<T>::type future_type; + promise<future_type> p; + p.set_value(boost::forward<T>(value)); + return BOOST_THREAD_MAKE_RV_REF(p.get_future().share()); + } + + inline shared_future<void> make_shared_future() { + promise<void> p; + return BOOST_THREAD_MAKE_RV_REF(p.get_future().share()); + } + +// //////////////////////////////// +// // make_ready_shared_future +// //////////////////////////////// +// template <typename T> +// shared_future<typename decay<T>::type> make_ready_shared_future(BOOST_THREAD_FWD_REF(T) value) +// { +// typedef typename decay<T>::type future_type; +// promise<future_type> p; +// p.set_value(boost::forward<T>(value)); +// return p.get_future().share(); +// } // -// BOOST_THREAD_FUTURE<R> ret = pt.get_future(); -// boost::thread( boost::move(pt) ).detach(); -// return ::boost::move(ret); -// } -// else if (int(policy) & int(launch::deferred)) -// { -// packaged_task<R> pt( f ); // -// BOOST_THREAD_FUTURE<R> ret = pt.get_future(); -// return ::boost::move(ret); -// } else { -// BOOST_THREAD_FUTURE<R> ret; -// return ::boost::move(ret); -// } +// inline shared_future<void> make_ready_shared_future() +// { +// promise<void> p; +// return BOOST_THREAD_MAKE_RV_REF(p.get_future().share()); +// +// } +// +// //////////////////////////////// +// // make_exceptional_shared_future +// //////////////////////////////// +// template <typename T> +// shared_future<T> make_exceptional_shared_future(exception_ptr ex) +// { +// promise<T> p; +// p.set_exception(ex); +// return p.get_future().share(); +// } + + //////////////////////////////// + // detail::future_async_continuation_shared_state + //////////////////////////////// +#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION +namespace detail +{ + + ///////////////////////// + /// future_async_continuation_shared_state + ///////////////////////// + + template<typename F, typename Rp, typename Fp> + struct future_async_continuation_shared_state: future_async_shared_state_base<Rp> + { + F parent; + Fp continuation; + + public: + future_async_continuation_shared_state(BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c) + : parent(boost::move(f)), + continuation(boost::move(c)) { + } + + void launch_continuation(boost::unique_lock<boost::mutex>& ) { + //lock.unlock(); + this->thr_ = thread(&future_async_continuation_shared_state::run, this); + } + + static void run(future_async_continuation_shared_state* that) { + try { + that->mark_finished_with_result(that->continuation(boost::move(that->parent))); +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(thread_interrupted& ) { + that->mark_interrupted_finish(); +#endif + } catch(...) { + that->mark_exceptional_finish(); + } + } + + ~future_async_continuation_shared_state() { + this->join(); + } + }; + + template<typename F, typename Fp> + struct future_async_continuation_shared_state<F, void, Fp>: public future_async_shared_state_base<void> + { + F parent; + Fp continuation; + + public: + future_async_continuation_shared_state(BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c) + : parent(boost::move(f)), + continuation(boost::move(c)) { + } + + void launch_continuation(boost::unique_lock<boost::mutex>& ) { + //lk.unlock(); + this->thr_ = thread(&future_async_continuation_shared_state::run, this); + } + + static void run(future_async_continuation_shared_state* that) { + try { + that->continuation(boost::move(that->parent)); + that->mark_finished_with_result(); +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(thread_interrupted& ) { + that->mark_interrupted_finish(); +#endif + } catch(...) { + that->mark_exceptional_finish(); + } + } + + ~future_async_continuation_shared_state() { + this->join(); + } + }; + + ////////////////////////// + /// future_deferred_continuation_shared_state + ////////////////////////// + template<typename F, typename Rp, typename Fp> + struct future_deferred_continuation_shared_state: shared_state<Rp> + { + F parent; + Fp continuation; + + public: + future_deferred_continuation_shared_state(BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c) + : parent(boost::move(f)), + continuation(boost::move(c)) { + this->set_deferred(); + } + + virtual void launch_continuation(boost::unique_lock<boost::mutex>& ) { + //execute(lk); + } + + virtual void execute(boost::unique_lock<boost::mutex>& lck) { + try { + Fp local_fuct=boost::move(continuation); + F ftmp = boost::move(parent); + relocker relock(lck); + Rp res = local_fuct(boost::move(ftmp)); + relock.lock(); + this->mark_finished_with_result_internal(boost::move(res), lck); + } catch (...) { + this->mark_exceptional_finish_internal(current_exception(), lck); + } + } + }; + + template<typename F, typename Fp> + struct future_deferred_continuation_shared_state<F,void,Fp>: shared_state<void> + { + F parent; + Fp continuation; + + public: + future_deferred_continuation_shared_state(BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c) + : parent(boost::move(f)), + continuation(boost::move(c)) { + this->set_deferred(); + } + + virtual void launch_continuation(boost::unique_lock<boost::mutex>& ) { + //execute(lk); + } + virtual void execute(boost::unique_lock<boost::mutex>& lck) { + try { + Fp local_fuct=boost::move(continuation); + F ftmp = boost::move(parent); + relocker relock(lck); + local_fuct(boost::move(ftmp)); + relock.lock(); + this->mark_finished_with_result_internal(lck); + } catch (...) { + this->mark_exceptional_finish_internal(current_exception(), lck); + } + } + }; + + //////////////////////////////// + // make_future_deferred_continuation_shared_state + //////////////////////////////// + template<typename F, typename Rp, typename Fp> + BOOST_THREAD_FUTURE<Rp> + make_future_deferred_continuation_shared_state( + boost::unique_lock<boost::mutex> &lock, + BOOST_THREAD_RV_REF(F) f, BOOST_THREAD_FWD_REF(Fp) c) { + shared_ptr<future_deferred_continuation_shared_state<F, Rp, Fp> > + h(new future_deferred_continuation_shared_state<F, Rp, Fp>(boost::move(f), boost::forward<Fp>(c))); + h->parent.future_->set_continuation_ptr(h, lock); + return BOOST_THREAD_FUTURE<Rp>(h); + } + + //////////////////////////////// + // make_future_async_continuation_shared_state + //////////////////////////////// + template<typename F, typename Rp, typename Fp> + BOOST_THREAD_FUTURE<Rp> + make_future_async_continuation_shared_state( + boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f, + BOOST_THREAD_FWD_REF(Fp) c) { + shared_ptr<future_async_continuation_shared_state<F,Rp, Fp> > + h(new future_async_continuation_shared_state<F,Rp, Fp>(boost::move(f), boost::forward<Fp>(c))); + h->parent.future_->set_continuation_ptr(h, lock); + + return BOOST_THREAD_FUTURE<Rp>(h); + } +} + + //////////////////////////////// + // template<typename F> + // auto future<R>::then(F&& func) -> BOOST_THREAD_FUTURE<decltype(func(*this))>; + //////////////////////////////// + + template <typename R> + template <typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE<R>)>::type> + BOOST_THREAD_FUTURE<R>::then(launch policy, BOOST_THREAD_FWD_REF(F) func) { + typedef typename boost::result_of<F(BOOST_THREAD_FUTURE<R>)>::type future_type; + BOOST_THREAD_ASSERT_PRECONDITION(this->future_!=0, future_uninitialized()); + + boost::unique_lock<boost::mutex> lock(this->future_->mutex); + if (underlying_cast<int>(policy) & int(launch::async)) { + return BOOST_THREAD_MAKE_RV_REF((boost::detail::make_future_async_continuation_shared_state<BOOST_THREAD_FUTURE<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func) + ))); + } else if (underlying_cast<int>(policy) & int(launch::deferred)) { + return BOOST_THREAD_MAKE_RV_REF((boost::detail::make_future_deferred_continuation_shared_state<BOOST_THREAD_FUTURE<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func) + ))); + } else { + return BOOST_THREAD_MAKE_RV_REF((boost::detail::make_future_async_continuation_shared_state<BOOST_THREAD_FUTURE<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func) + ))); + } + } + + template <typename R> + template <typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE<R>)>::type> + BOOST_THREAD_FUTURE<R>::then(BOOST_THREAD_FWD_REF(F) func) { + typedef typename boost::result_of<F(BOOST_THREAD_FUTURE<R>)>::type future_type; + BOOST_THREAD_ASSERT_PRECONDITION(this->future_!=0, future_uninitialized()); + + boost::unique_lock<boost::mutex> lock(this->future_->mutex); + if (underlying_cast<int>(this->launch_policy(lock)) & int(launch::async)) { + return boost::detail::make_future_async_continuation_shared_state<BOOST_THREAD_FUTURE<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func) + ); + } else if (underlying_cast<int>(this->launch_policy(lock)) & int(launch::deferred)) { + this->future_->wait_internal(lock); + return boost::detail::make_future_deferred_continuation_shared_state<BOOST_THREAD_FUTURE<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func) + ); + } else { + return boost::detail::make_future_async_continuation_shared_state<BOOST_THREAD_FUTURE<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func) + ); + } + } + + +//#if 0 && defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) +// template <typename R> +// template<typename RF> +// BOOST_THREAD_FUTURE<RF> +// BOOST_THREAD_FUTURE<R>::then(RF(*func)(BOOST_THREAD_FUTURE<R>&)) +// { +// +// typedef RF future_type; +// +// if (this->future_) +// { +// boost::unique_lock<boost::mutex> lock(this->future_->mutex); +// detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&) > *ptr = +// new detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&)>(*this, func); +// if (ptr==0) +// { +// return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>()); +// } +// this->future_->set_continuation_ptr(ptr, lock); +// return ptr->get_future(); +// } else { +// // fixme what to do when the future has no associated state? +// return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>()); // } -// template <class F> -// BOOST_THREAD_FUTURE<typename boost::result_of<F()>::type> -// async(F const& f) +// +// } +// template <typename R> +// template<typename RF> +// BOOST_THREAD_FUTURE<RF> +// BOOST_THREAD_FUTURE<R>::then(launch policy, RF(*func)(BOOST_THREAD_FUTURE<R>&)) +// { +// +// typedef RF future_type; +// +// if (this->future_) // { -// return async(launch::any, f); +// boost::unique_lock<boost::mutex> lock(this->future_->mutex); +// detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&) > *ptr = +// new detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&)>(*this, func, policy); +// if (ptr==0) +// { +// return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>()); +// } +// this->future_->set_continuation_ptr(ptr, lock); +// return ptr->get_future(); +// } else { +// // fixme what to do when the future has no associated state? +// return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>()); // } +// +// } +//#endif + + template <typename R> + template <typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(shared_future<R>)>::type> + shared_future<R>::then(launch policy, BOOST_THREAD_FWD_REF(F) func) + { + typedef typename boost::result_of<F(shared_future<R>)>::type future_type; + BOOST_THREAD_ASSERT_PRECONDITION(this->future_!=0, future_uninitialized()); + + boost::unique_lock<boost::mutex> lock(this->future_->mutex); + if (underlying_cast<int>(policy) & int(launch::async)) { + return BOOST_THREAD_MAKE_RV_REF((boost::detail::make_future_async_continuation_shared_state<shared_future<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func) + ))); + } else if (underlying_cast<int>(policy) & int(launch::deferred)) { + return BOOST_THREAD_MAKE_RV_REF((boost::detail::make_future_deferred_continuation_shared_state<shared_future<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func) + ))); + } else { + return BOOST_THREAD_MAKE_RV_REF((boost::detail::make_future_async_continuation_shared_state<shared_future<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func) + ))); + } + } + + template <typename R> + template <typename F> + inline BOOST_THREAD_FUTURE<typename boost::result_of<F(shared_future<R>)>::type> + shared_future<R>::then(BOOST_THREAD_FWD_REF(F) func) { + typedef typename boost::result_of<F(shared_future<R>)>::type future_type; + + BOOST_THREAD_ASSERT_PRECONDITION(this->future_!=0, future_uninitialized()); + + boost::unique_lock<boost::mutex> lock(this->future_->mutex); + if (underlying_cast<int>(this->launch_policy(lock)) & int(launch::async)) { + return boost::detail::make_future_async_continuation_shared_state<shared_future<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func)); + } else if (underlying_cast<int>(this->launch_policy(lock)) & int(launch::deferred)) { + this->future_->wait_internal(lock); + return boost::detail::make_future_deferred_continuation_shared_state<shared_future<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func)); + } else { + return boost::detail::make_future_async_continuation_shared_state<shared_future<R>, future_type, F>( + lock, boost::move(*this), boost::forward<F>(func)); + } + } + +namespace detail +{ + template <typename T> + struct mfallbacker_to + { + T value_; + typedef T result_type; + mfallbacker_to(BOOST_THREAD_RV_REF(T) v) + : value_(boost::move(v)) + {} + + T operator()(BOOST_THREAD_FUTURE<T> fut) { + return fut.get_or(boost::move(value_)); + } + }; + template <typename T> + struct cfallbacker_to + { + T value_; + typedef T result_type; + cfallbacker_to(T const& v) + : value_(v) + {} + + T operator()(BOOST_THREAD_FUTURE<T> fut) { + return fut.get_or(value_); + + } + }; +} + //////////////////////////////// + // future<R> future<R>::fallback_to(R&& v); + //////////////////////////////// + + template <typename R> + template <typename R2> + inline typename boost::disable_if< is_void<R2>, BOOST_THREAD_FUTURE<R> >::type + BOOST_THREAD_FUTURE<R>::fallback_to(BOOST_THREAD_RV_REF(R2) v) { + return then(detail::mfallbacker_to<R>(boost::move(v))); + } + + template <typename R> + template <typename R2> + inline typename boost::disable_if< is_void<R2>, BOOST_THREAD_FUTURE<R> >::type + BOOST_THREAD_FUTURE<R>::fallback_to(R2 const& v) { + return then(detail::cfallbacker_to<R>(v)); + } + +#endif + +#if defined BOOST_THREAD_PROVIDES_FUTURE_UNWRAP +namespace detail +{ + ///////////////////////// + /// future_unwrap_shared_state + ///////////////////////// + + template<typename F, typename Rp> + struct future_unwrap_shared_state: shared_state<Rp> + { + F parent; + public: + explicit future_unwrap_shared_state(BOOST_THREAD_RV_REF(F) f) + : parent(boost::move(f)) {} + virtual void wait(bool ) { // todo see if rethrow must be used + boost::unique_lock<boost::mutex> lock(mutex); + parent.get().wait(); + } + virtual Rp get() { + boost::unique_lock<boost::mutex> lock(mutex); + return parent.get().get(); + } + }; + + template <class F, class Rp> + BOOST_THREAD_FUTURE<Rp> + make_future_unwrap_shared_state(boost::unique_lock<boost::mutex> &lock, BOOST_THREAD_RV_REF(F) f) { + shared_ptr<future_unwrap_shared_state<F, Rp> > + h(new future_unwrap_shared_state<F, Rp>(boost::move(f))); + h->parent.future_->set_continuation_ptr(h, lock); + return BOOST_THREAD_FUTURE<Rp>(h); + } +} + + template <typename R> + inline BOOST_THREAD_FUTURE<R>::BOOST_THREAD_FUTURE(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE<BOOST_THREAD_FUTURE<R> >) other) + : base_type(other.unwrap()) {} - template <class F> - BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type> - async(launch policy, BOOST_THREAD_FWD_REF(F) f) + template <typename R2> + BOOST_THREAD_FUTURE<R2> + BOOST_THREAD_FUTURE<BOOST_THREAD_FUTURE<R2> >::unwrap() + { + BOOST_THREAD_ASSERT_PRECONDITION(this->future_!=0, future_uninitialized()); + boost::unique_lock<boost::mutex> lock(this->future_->mutex); + return boost::detail::make_future_unwrap_shared_state<BOOST_THREAD_FUTURE<BOOST_THREAD_FUTURE<R2> >, R2>(lock, boost::move(*this)); + } +#endif + +#if defined BOOST_THREAD_PROVIDES_FUTURE_WHEN_ALL_WHEN_ANY +namespace detail +{ + struct input_iterator_tag {}; + struct vector_tag {}; + struct values_tag {}; + template <typename T> + struct alias_t { typedef T type; }; + + BOOST_CONSTEXPR_OR_CONST input_iterator_tag input_iterator_tag_value = {}; + BOOST_CONSTEXPR_OR_CONST vector_tag vector_tag_value = {}; + BOOST_CONSTEXPR_OR_CONST values_tag values_tag_value = {}; + //////////////////////////////// + // detail::future_async_when_all_shared_state + //////////////////////////////// + template<typename F> + struct future_when_all_vector_shared_state: future_async_shared_state_base<csbl::vector<F> > + { + typedef csbl::vector<F> vector_type; + typedef typename F::value_type value_type; + csbl::vector<F> vec_; + + static void run(future_when_all_vector_shared_state* that) { + try { + boost::wait_for_all(that->vec_.begin(), that->vec_.end()); + that->mark_finished_with_result(boost::move(that->vec_)); +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(thread_interrupted& ) { + that->mark_interrupted_finish(); +#endif + } catch(...) { + that->mark_exceptional_finish(); + } + } + void init() { + this->thr_ = thread(&future_when_all_vector_shared_state::run, this); + } + + public: + template< typename InputIterator> + future_when_all_vector_shared_state(input_iterator_tag, InputIterator first, InputIterator last) + : vec_(std::make_move_iterator(first), std::make_move_iterator(last)) { - typedef typename boost::result_of<typename decay<F>::type()>::type R; - if (int(policy) & int(launch::async)) - { - packaged_task<R> pt( boost::forward<F>(f) ); + init(); + } - BOOST_THREAD_FUTURE<R> ret = pt.get_future(); - boost::thread( boost::move(pt) ).detach(); - return ::boost::move(ret); - } - else if (int(policy) & int(launch::deferred)) - { - packaged_task<R> pt( boost::forward<F>(f) ); + future_when_all_vector_shared_state(vector_tag, BOOST_THREAD_RV_REF(csbl::vector<F>) v) + : vec_(boost::move(v)) + { + init(); + } - BOOST_THREAD_FUTURE<R> ret = pt.get_future(); - return ::boost::move(ret); - } else { - BOOST_THREAD_FUTURE<R> ret; - return ::boost::move(ret); - } +#if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) + template< typename T0, typename ...T> + future_when_all_vector_shared_state(values_tag, BOOST_THREAD_RV_REF(T0) f, BOOST_THREAD_RV_REF(T) ... futures) { + vec_.push_back(boost::forward<T0>(f)); + typename alias_t<char[]>::type{ + ( //first part of magic unpacker + vec_.push_back(boost::forward<T>(futures)),'0' + )..., '0' + }; //second part of magic unpacker + init(); + } +#else +#endif + ~future_when_all_vector_shared_state() { + this->join(); + } + + }; + + //////////////////////////////// + // detail::future_async_when_any_shared_state + //////////////////////////////// + template<typename F> + struct future_when_any_vector_shared_state: future_async_shared_state_base<csbl::vector<F> > + { + typedef csbl::vector<F> vector_type; + typedef typename F::value_type value_type; + csbl::vector<F> vec_; + + static void run(future_when_any_vector_shared_state* that) + { + try { + boost::wait_for_any(that->vec_.begin(), that->vec_.end()); + that->mark_finished_with_result(boost::move(that->vec_)); +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS + } catch(thread_interrupted& ) { + that->mark_interrupted_finish(); +#endif + } catch(...) { + that->mark_exceptional_finish(); + } + } + void init() { + this->thr_ = thread(&future_when_any_vector_shared_state::run, this); + } + + public: + template< typename InputIterator> + future_when_any_vector_shared_state(input_iterator_tag, InputIterator first, InputIterator last) + : vec_(std::make_move_iterator(first), std::make_move_iterator(last)) + { + init(); } - template <class F> - BOOST_THREAD_FUTURE<typename boost::result_of<F()>::type> - async(BOOST_THREAD_FWD_REF(F) f) + + future_when_any_vector_shared_state(vector_tag, BOOST_THREAD_RV_REF(csbl::vector<F>) v) + : vec_(boost::move(v)) { - return async(launch::any, boost::forward<F>(f)); + init(); } +#if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) + template< typename T0, typename ...T> + future_when_any_vector_shared_state(values_tag, + BOOST_THREAD_RV_REF(T0) f, BOOST_THREAD_RV_REF(T) ... futures + ) { + vec_.push_back(boost::forward<T0>(f)); + typename alias_t<char[]>::type{ + ( //first part of magic unpacker + vec_.push_back(boost::forward<T>(futures)) + ,'0' + )..., + '0' + }; //second part of magic unpacker + init(); + } #endif + ~future_when_any_vector_shared_state() { + this->join(); + } + + }; + +#if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) +//#if ! defined(BOOST_NO_CXX11_HDR_TUPLE) + template< typename T0, typename ...T> + struct future_when_all_tuple_shared_state: future_async_shared_state_base< + csbl::tuple<BOOST_THREAD_FUTURE<typename T0::value_type>, BOOST_THREAD_FUTURE<typename T::value_type>... > + > + { + + }; + template< typename T0, typename ...T> + struct future_when_any_tuple_shared_state: future_async_shared_state_base< + csbl::tuple<BOOST_THREAD_FUTURE<typename T0::value_type>, BOOST_THREAD_FUTURE<typename T::value_type>... > + > + { + }; +//#endif +#endif + +#if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) + template< typename ...T> + struct are_same : true_type {}; + template< typename T0 > + struct are_same<T0> : true_type {}; + template< typename T0, typename T1, typename ...T> + struct are_same<T0, T1, T...> : integral_constant<bool, is_same<T0,T1>::value && are_same<T1, T...>::value> {}; + + template< bool AreSame, typename T0, typename ...T> + struct when_type_impl; + + template< typename T0, typename ...T> + struct when_type_impl<true, T0, T...> + { + typedef csbl::vector<typename decay<T0>::type> container_type; + typedef typename container_type::value_type value_type; + typedef detail::future_when_all_vector_shared_state<value_type> factory_all_type; + typedef detail::future_when_any_vector_shared_state<value_type> factory_any_type; + }; +//#if ! defined(BOOST_NO_CXX11_HDR_TUPLE) + template< typename T0, typename ...T> + struct when_type_impl<false, T0, T...> + { + typedef csbl::tuple<BOOST_THREAD_FUTURE<typename T0::value_type>, BOOST_THREAD_FUTURE<typename T::value_type>... > container_type; + typedef detail::future_when_all_tuple_shared_state<T0, T...> factory_all_type; + typedef detail::future_when_any_tuple_shared_state<T0, T...> factory_any_type; + }; +//#endif + + template< typename T0, typename ...T> + struct when_type : when_type_impl<are_same<T0, T...>::value, T0, T...> {}; +#endif +} + + template< typename InputIterator> + typename boost::disable_if<is_future_type<InputIterator>, + BOOST_THREAD_FUTURE<csbl::vector<typename InputIterator::value_type> > + >::type + when_all(InputIterator first, InputIterator last) { + typedef typename InputIterator::value_type value_type; + typedef csbl::vector<value_type> container_type; + typedef detail::future_when_all_vector_shared_state<value_type> factory_type; + + if (first==last) return make_ready_future(container_type()); + shared_ptr<factory_type > + h(new factory_type>(detail::input_iterator_tag_value, first,last)); + return BOOST_THREAD_FUTURE<container_type>(h); + } + +//#if ! defined(BOOST_NO_CXX11_HDR_TUPLE) + inline BOOST_THREAD_FUTURE<csbl::tuple<> > when_all() { + return make_ready_future(csbl::tuple<>()); + } +//#endif + +#if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) + template< typename T0, typename ...T> + BOOST_THREAD_FUTURE<typename detail::when_type<T0, T...>::container_type> + when_all(BOOST_THREAD_RV_REF(T0) f, BOOST_THREAD_RV_REF(T) ... futures) { + typedef typename detail::when_type<T0, T...>::container_type container_type; + typedef typename detail::when_type<T0, T...>::factory_all_type factory_type; + + shared_ptr<factory_type> + h(new factory_type(detail::values_tag_value, boost::forward<T0>(f), boost::forward<T>(futures)...)); + return BOOST_THREAD_FUTURE<container_type>(h); + } +#endif + + template< typename InputIterator> + typename boost::disable_if<is_future_type<InputIterator>, + BOOST_THREAD_FUTURE<csbl::vector<typename InputIterator::value_type> > + >::type + when_any(InputIterator first, InputIterator last) { + typedef typename InputIterator::value_type value_type; + typedef csbl::vector<value_type> container_type; + typedef detail::future_when_any_vector_shared_state<value_type> factory_type; + + if (first==last) return make_ready_future(container_type()); + shared_ptr<factory_type > + h(new factory_type>(detail::input_iterator_tag_value, first,last)); + return BOOST_THREAD_FUTURE<container_type>(h); + } + +//#if ! defined(BOOST_NO_CXX11_HDR_TUPLE) + inline BOOST_THREAD_FUTURE<csbl::tuple<> > when_any() { + return make_ready_future(csbl::tuple<>()); + } +//#endif + +#if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) + template< typename T0, typename ...T> + BOOST_THREAD_FUTURE<typename detail::when_type<T0, T...>::container_type> + when_any(BOOST_THREAD_RV_REF(T0) f, BOOST_THREAD_RV_REF(T) ... futures) { + typedef typename detail::when_type<T0, T...>::container_type container_type; + typedef typename detail::when_type<T0, T...>::factory_any_type factory_type; + + shared_ptr<factory_type> + h(new factory_type(detail::values_tag_value, boost::forward<T0>(f), boost::forward<T>(futures)...)); + return BOOST_THREAD_FUTURE<container_type>(h); + } +#endif +#endif // BOOST_THREAD_PROVIDES_FUTURE_WHEN_ALL_WHEN_ANY } #endif // BOOST_NO_EXCEPTION |