Merge branch 'develop'

doc/async_executors.qbk

@@ -1,5 +1,5 @@
 [/
- / Copyright (c) 2014-2015 Vicente J. Botet Escriba
+ / Copyright (c) 2014 Vicente J. Botet Escriba
  /
  / Distributed under the Boost Software License, Version 1.0. (See accompanying
  / file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -174,7 +174,7 @@ This has several advantages:
 * The scheduled operations are available for all the executors via wrappers.
 * The template functions could accept any chrono `time_point` and `duration` respectively as we are not working with virtual functions.
 
-In order to manage with all the clocks, this library propose a generic solution. `scheduler<Clock>` know how to manage with the `submit_at`/`submit_after` `Clock::time_point`/`Clock::duration` tasks. Note that the durations on different clocks differ.
+In order to manage with all the clocks, this library propose generic solution. `scheduler<Clock>` know how to manage with the `submit_at`/`submit_after` `Clock::time_point`/`Clock::duration` tasks. Note that the durations on different clocks differ.
 
 [heading Not Handled Exceptions]
 As in N3785 and based on the same design decision than `std`/`boost::thread` if a user closure throws an exception, the executor must call the `std::terminate` function.
@@ -506,6 +506,9 @@ Executor abstract base class.
     public:
       typedef  boost::work work;
   
+      executor(executor const&) = delete;
+      executor& operator=(executor const&) = delete;
+
       executor(); 
       virtual ~executor() {};
   
@@ -570,6 +573,9 @@ Polymorphic adaptor of a model of Executor to an executor.
     public:
       typedef  executor::work work;
   
+      executor_adaptor(executor_adaptor const&) = delete;
+      executor_adaptor& operator=(executor_adaptor const&) = delete;
+  
       template <typename ...Args>
       executor_adaptor(Args&& ... args);
 
@@ -635,24 +641,20 @@ Polymorphic adaptor of a model of Executor to an executor.
 [/////////////////////////////////]
 [section:generic_executor_ref Class `generic_executor_ref`]
 
-Type erased executor class.
+Executor abstract base class.
 
   #include <boost/thread/generic_executor_ref.hpp>
   namespace boost {
     class generic_executor_ref
     {
     public:
+      generic_executor_ref(generic_executor_ref const&);
+      generic_executor_ref& operator=(generic_executor_ref const&);
 
       template <class Executor>
       generic_executor_ref(Executor& ex); 
-      generic_executor_ref() = delete;
-      generic_executor_ref(generic_executor_ref const&) = default;
-      generic_executor_ref(generic_executor_ref &&) = default;
-      generic_executor_ref& operator=(generic_executor_ref const&) = default;
-      generic_executor_ref& operator=(generic_executor_ref &&) = default;
+      generic_executor_ref() {};
   
-      executor& underlying_executor() noexcept;
-
       void close() = 0;
       bool closed() = 0;
   
@@ -667,44 +669,6 @@ Type erased executor class.
 
 [endsect]
 
-
-[/////////////////////////////////]
-[section:generic_executor Class `generic_executor`]
-
-Type erased executor class.
-
-  #include <boost/thread/generic_executor.hpp>
-  namespace boost {
-    class generic_executor
-    {
-    public:
-
-      template <class Executor>
-      generic_executor(Executor& ex); 
-      generic_executor() = delete;
-
-      generic_executor(generic_executor const&) = default;
-      generic_executor(generic_executor &&) = default;
-      generic_executor& operator=(generic_executor const&) = default;
-      generic_executor& operator=(generic_executor &&) = default;
-  
-      executor& underlying_executor() noexcept;
-
-      void close() = 0;
-      bool closed() = 0;
-  
-      template <typename Closure>
-      void submit(Closure&& closure);
-  
-      virtual bool try_executing_one() = 0;
-      template <typename Pred>
-      bool reschedule_until(Pred const& pred);
-    };
-  }
-
-[endsect]
-
-
 [//////////////////////////////////////////////////////////]
 [section: scheduler Template Class `scheduler `]
 
@@ -719,7 +683,10 @@ Scheduler providing time related functions. Note that `scheduler` is not an Exec
     public:
       using work = boost::function<void()> ;
       using clock = Clock;
- 
+
+      scheduler(scheduler const&) = delete;
+      scheduler& operator=(scheduler const&) = delete;
+  
       scheduler();
       ~scheduler();
  
@@ -766,7 +733,7 @@ Scheduler providing time related functions. Note that `scheduler` is not an Exec
 
 [[Effects:] [Destroys the scheduler.]]
 
-[[Synchronization:] [The completion of all the closures happen before the completion of the destructor.]]
+[[Synchronization:] [The completion of all the closures happen before the completion of the executor destructor.]]
 
 ]
 
@@ -1372,6 +1339,10 @@ A serial executor ensuring that there are no two work units that executes concur
     class serial_executor
     {
     public:
+      serial_executor(serial_executor const&) = delete;
+      serial_executor& operator=(serial_executor const&) = delete;
+  
+      template <class Executor>
       serial_executor(Executor& ex);
  
       Executor& underlying_executor() noexcept;
@@ -1422,7 +1393,7 @@ A serial executor ensuring that there are no two work units that executes concur
 [/////////////////////////////////////]
 [section:underlying_executor Function member `underlying_executor()`]
 
-      Executor& underlying_executor() noexcept;
+      generic_executor_ref& underlying_executor() noexcept;
 
 [variablelist
 
@@ -1447,10 +1418,13 @@ A serial executor ensuring that there are no two work units that executes concur
     class generic_serial_executor
     {
     public:
+      generic_serial_executor(generic_serial_executor const&) = delete;
+      generic_serial_executor& operator=(generic_serial_executor const&) = delete;
+  
       template <class Executor>
       generic_serial_executor(Executor& ex);
  
-      generic_executor& underlying_executor() noexcept;
+      generic_executor_ref& underlying_executor() noexcept;
 
       void close();
       bool closed();
@@ -1459,7 +1433,6 @@ A serial executor ensuring that there are no two work units that executes concur
       void submit(Closure&& closure);
   
       bool try_executing_one();
-
       template <typename Pred>
       bool reschedule_until(Pred const& pred);
 
@@ -1483,7 +1456,7 @@ A serial executor ensuring that there are no two work units that executes concur
 
 [endsect]
 [/////////////////////////////////////]
-[section:destructor Destructor `~generic_serial_executor()`]
+[section:destructor Destructor `~serial_executor()`]
 
       ~generic_serial_executor();
 
@@ -1495,80 +1468,6 @@ A serial executor ensuring that there are no two work units that executes concur
 
 ]
 
-[endsect]
-[/////////////////////////////////////]
-[section:underlying_executor Function member `underlying_executor()`]
-
-      generic_executor& underlying_executor() noexcept;
-
-[variablelist
-
-[[Return:] [The underlying executor instance. ]]
-
-]
-
-
-[endsect]
-
-[endsect]
-
-[//////////////////////////////////////////////////////////]
-[section:serial_executor_cont Template Class `serial_executor_cont`]
-
-A serial executor ensuring that there are no two work units that executes concurrently.
-
-  #include <boost/thread/serial_executor_cont.hpp>
-  namespace boost {
-    template <class Executor>
-    class serial_executor_cont
-    {
-    public:
-      serial_executor_cont(Executor& ex);
- 
-      Executor& underlying_executor() noexcept;
-
-      void close();
-      bool closed();
-  
-      template <typename Closure>
-      void submit(Closure&& closure);
-  
-      bool try_executing_one();
-      template <typename Pred>
-      bool reschedule_until(Pred const& pred);
-
-    };
-  }
-
-[/////////////////////////////////////]
-[section:constructor Constructor `serial_executor_cont(Executor&)`]
-
-      template <class Executor>
-      serial_executor_cont(Executor& ex);
-
-[variablelist
-
-[[Effects:] [Constructs a serial_executor_cont. ]]
-
-[[Throws:] [Nothing. ]]
-
-]
-
-
-[endsect]
-[/////////////////////////////////////]
-[section:destructor Destructor `~serial_executor_cont()`]
-
-      ~serial_executor_cont();
-
-[variablelist
-
-[[Effects:] [Destroys the serial_executor.]]
-
-[[Synchronization:] [The completion of all the closures happen before the completion of the executor destructor.]]
-
-]
-
 [endsect]
 [/////////////////////////////////////]
 [section:underlying_executor Function member `underlying_executor()`]
@@ -1579,8 +1478,6 @@ A serial executor ensuring that there are no two work units that executes concur
 
 [[Return:] [The underlying executor instance. ]]
 
-[[Throws:] [Nothing.]]
-
 ]
 
 
@@ -1588,82 +1485,6 @@ A serial executor ensuring that there are no two work units that executes concur
 
 [endsect]
 
-[//////////////////////////////////////////////////////////]
-[section:generic_serial_cont_executor Class `generic_serial_cont_executor`]
-
-A serial executor ensuring that there are no two work units that executes concurrently.
-
-  #include <boost/thread/generic_serial_cont_executor.hpp>
-  namespace boost {
-    class generic_serial_cont_executor
-    {
-    public:
-      template <class Executor>
-      generic_serial_cont_executor(Executor& ex);
- 
-      generic_executor& underlying_executor() noexcept;
-
-      void close();
-      bool closed();
-  
-      template <typename Closure>
-      void submit(Closure&& closure);
-  
-      bool try_executing_one();
-
-      template <typename Pred>
-      bool reschedule_until(Pred const& pred);
-
-    };
-  }
-
-[/////////////////////////////////////]
-[section:constructor Constructor `generic_serial_cont_executor(Executor&)`]
-
-      template <class Executor>
-      generic_serial_cont_executor(Executor& ex);
-
-[variablelist
-
-[[Effects:] [Constructs a generic_serial_cont_executor. ]]
-
-[[Throws:] [Nothing. ]]
-
-]
-
-
-[endsect]
-[/////////////////////////////////////]
-[section:destructor Destructor `~generic_serial_cont_executor()`]
-
-      ~generic_serial_cont_executor();
-
-[variablelist
-
-[[Effects:] [Destroys the generic_serial_cont_executor.]]
-
-[[Synchronization:] [The completion of all the closures happen before the completion of the executor destructor.]]
-
-]
-
-[endsect]
-[/////////////////////////////////////]
-[section:underlying_executor Function member `underlying_executor()`]
-
-      generic_executor& underlying_executor() noexcept;
-
-[variablelist
-
-[[Return:] [The underlying executor instance. ]]
-
-]
-
-
-[endsect]
-
-[endsect]
-
-
 
 [//////////////////////////////////////////////////////////]
 [section:inline_executor Class `inline_executor`]
@@ -1675,8 +1496,10 @@ A serial executor ensuring that there are no two work units that executes concur
     class inline_executor
     {
     public:
+      inline_executor(inline_executor const&) = delete;
+      inline_executor& operator=(inline_executor const&) = delete;
+  
       inline_executor();
-      ~inline_executor();
  
       void close();
       bool closed();
@@ -1737,6 +1560,9 @@ A thread pool with up to a fixed number of threads.
     class basic_thread_pool
     { 
     public:
+ 
+      basic_thread_pool(basic_thread_pool const&) = delete;
+      basic_thread_pool& operator=(basic_thread_pool const&) = delete;
   
       basic_thread_pool(unsigned const thread_count = thread::hardware_concurrency());
       template <class AtThreadEntry>
@@ -1797,6 +1623,9 @@ A thread_executor with a threads for each task.
     { 
     public:
  
+      thread_executor(thread_executor const&) = delete;
+      thread_executor& operator=(thread_executor const&) = delete;
+  
       thread_executor();
       template <class AtThreadEntry>
       basic_thread_pool( unsigned const thread_count, AtThreadEntry at_thread_entry);
@@ -1851,6 +1680,9 @@ A user scheduled executor.
     class loop_executor
     { 
     public:
+ 
+      loop_executor(loop_executor const&) = delete;
+      loop_executor& operator=(loop_executor const&) = delete;
   
       loop_executor();
       ~loop_executor();

doc/sync_tutorial.qbk

@@ -7,7 +7,7 @@
 
 [section:tutorial Tutorial]
 
-[@http://web.archive.org/web/20140531071228/http://home.roadrunner.com/~hinnant/mutexes/locking.html Handling mutexes in C++] is an excellent tutorial. You need just replace std and ting by boost.
+[@http://home.roadrunner.com/~hinnant/mutexes/locking.html Handling mutexes in C++] is an excellent tutorial. You need just replace std and ting by boost.
 
 [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2406.html Mutex, Lock, Condition Variable Rationale] adds rationale for the design decisions made for mutexes, locks and condition variables.
 

example/executor.cpp

@@ -17,7 +17,7 @@
 #include <boost/thread/caller_context.hpp>
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/thread/executors/loop_executor.hpp>
-#include <boost/thread/executors/generic_serial_executor.hpp>
+#include <boost/thread/executors/serial_executor.hpp>
 #include <boost/thread/executors/inline_executor.hpp>
 #include <boost/thread/executors/thread_executor.hpp>
 #include <boost/thread/executors/executor.hpp>
@@ -27,10 +27,8 @@
 #include <boost/assert.hpp>
 #include <string>
 #include <iostream>
-#include <cassert>
 
-boost::future<void> p(boost::future<void> f) {
-    assert(f.is_ready());
+boost::future<void> p(boost::future<void>) {
     return boost::make_ready_future();
 }
 
@@ -71,7 +69,7 @@ void submit_some(boost::executor& tp)
 }
 
 
-void at_th_entry(boost::basic_thread_pool )
+void at_th_entry(boost::basic_thread_pool& )
 {
 
 }
@@ -82,10 +80,6 @@ int test_executor_adaptor()
   {
     try
     {
-      {
-        boost::basic_thread_pool e1;
-        boost::basic_thread_pool e2 = e1;
-      }
       {
         boost::executor_adaptor < boost::basic_thread_pool > ea(4);
         submit_some( ea);
@@ -108,65 +102,25 @@ int test_executor_adaptor()
         submit_some(ea);
       }
       // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::loop_executor e1;
-        boost::loop_executor e2 = e1;
-        boost::executor_adaptor < boost::loop_executor > ea2(e2);
-        submit_some( ea2);
-        ea2.underlying_executor().run_queued_closures();
-      }
       {
         boost::executor_adaptor < boost::loop_executor > ea2;
         submit_some( ea2);
         ea2.underlying_executor().run_queued_closures();
       }
+#if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
       // std::cout << BOOST_CONTEXTOF << std::endl;
       {
-        boost::basic_thread_pool tp;
-        boost::generic_serial_executor e1(tp);
-        boost::generic_serial_executor e2 = e1;
-      }
-      {
-        boost::basic_thread_pool ea1(4);
-        boost::generic_serial_executor ea2(ea1);
-        boost::executor_adaptor < boost::generic_serial_executor > ea3(ea2);
-        submit_some(ea3);
-      }
-      {
-        boost::basic_thread_pool ea1(4);
-        boost::generic_serial_executor ea2(ea1);
-        boost::executor_adaptor < boost::generic_serial_executor > ea3(ea2);
-        submit_some(ea3);
-      }
-//#if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-      {
-        boost::basic_thread_pool ea1(4);
-        boost::executor_adaptor < boost::generic_serial_executor > ea2(ea1);
+        boost::executor_adaptor < boost::basic_thread_pool > ea1(4);
+        boost::executor_adaptor < boost::serial_executor > ea2(ea1);
         submit_some(ea2);
       }
-//#endif
+#endif
       // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::inline_executor e1;
-        boost::inline_executor e2 = e1;
-        boost::executor_adaptor < boost::inline_executor > ea2(e2);
-        submit_some(ea2);
-      }
       {
         boost::executor_adaptor < boost::inline_executor > ea1;
         submit_some(ea1);
       }
       // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::thread_executor e1;
-        boost::thread_executor e2 = e1;
-      }
-      {
-        boost::thread_executor e1;
-        boost::executor_adaptor < boost::generic_executor > ea2(e1);
-        submit_some(ea2);
-      }
-
       {
         boost::executor_adaptor < boost::thread_executor > ea1;
         submit_some(ea1);
@@ -202,13 +156,10 @@ int main()
   && defined BOOST_THREAD_PROVIDES_EXECUTORS \
   &&  ! defined BOOST_NO_CXX11_RVALUE_REFERENCES
 
-  boost::basic_thread_pool executor;
   // compiles
   boost::make_ready_future().then(&p);
 
-  // ??
-  boost::make_ready_future().then(executor, &p);
-
+  boost::basic_thread_pool executor;
   // doesn't compile
   boost::make_ready_future().then(executor, &p);
 #endif

example/generic_executor.cpp

@@ -1,184 +0,0 @@
-// Copyright (C) 2014 Vicente Botet
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/config.hpp>
-#if ! defined  BOOST_NO_CXX11_DECLTYPE
-#define BOOST_RESULT_OF_USE_DECLTYPE
-#endif
-
-#define BOOST_THREAD_VERSION 4
-#define BOOST_THREAD_PROVIDES_EXECUTORS
-//#define BOOST_THREAD_USES_LOG
-#define BOOST_THREAD_USES_LOG_THREAD_ID
-#define BOOST_THREAD_QUEUE_DEPRECATE_OLD
-
-#include <boost/thread/caller_context.hpp>
-#include <boost/thread/executors/basic_thread_pool.hpp>
-#include <boost/thread/executors/loop_executor.hpp>
-#include <boost/thread/executors/generic_serial_executor.hpp>
-#include <boost/thread/executors/serial_executor.hpp>
-#include <boost/thread/executors/inline_executor.hpp>
-#include <boost/thread/executors/thread_executor.hpp>
-#include <boost/thread/executors/executor.hpp>
-#include <boost/thread/executors/executor_adaptor.hpp>
-#include <boost/thread/executors/generic_executor.hpp>
-#include <boost/thread/executor.hpp>
-#include <boost/thread/future.hpp>
-#include <boost/assert.hpp>
-#include <string>
-#include <iostream>
-
-void p1()
-{
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  //boost::this_thread::sleep_for(boost::chrono::milliseconds(200));
-}
-
-void p2()
-{
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  //boost::this_thread::sleep_for(boost::chrono::seconds(10));
-}
-
-int f1()
-{
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::seconds(1));
-  return 1;
-}
-int f2(int i)
-{
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::seconds(2));
-  return i + 1;
-}
-
-void submit_some(boost::generic_executor tp)
-{
-  for (int i = 0; i < 3; ++i) {
-    tp.submit(&p2);
-  }
-  for (int i = 0; i < 3; ++i) {
-    tp.submit(&p1);
-  }
-
-}
-
-template < class Executor>
-void submit_some2(Executor& tp)
-{
-  for (int i = 0; i < 3; ++i) {
-    tp.submit(&p2);
-  }
-  for (int i = 0; i < 3; ++i) {
-    tp.submit(&p1);
-  }
-
-}
-
-template <class Executor>
-void submit_some3(boost::serial_executor<Executor>& tp)
-{
-  for (int i = 0; i < 3; ++i) {
-    tp.submit(&p2);
-  }
-  for (int i = 0; i < 3; ++i) {
-    tp.submit(&p1);
-  }
-}
-
-void at_th_entry(boost::basic_thread_pool)
-{
-
-}
-
-
-
-int test_generic_executor()
-{
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  {
-    try
-    {
-      {
-        boost::basic_thread_pool ea(4);
-        submit_some( ea);
-        {
-          boost::future<int> t1 = boost::async(ea, &f1);
-          boost::future<int> t2 = boost::async(ea, &f1);
-          // std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-          // std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
-        }
-        submit_some(ea);
-        {
-          boost::basic_thread_pool ea3(1);
-          boost::future<int> t1 = boost::async(ea3, &f1);
-          boost::future<int> t2 = boost::async(ea3, &f1);
-          //boost::future<int> t2 = boost::async(ea3, f2, 1); // todo this doesn't compiles yet on C++11
-          //boost::future<int> t2 = boost::async(ea3, boost::bind(f2, 1)); // todo this doesn't compiles yet on C++98
-          // std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-          // std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
-        }
-        submit_some(ea);
-      }
-      // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::loop_executor ea2;
-        submit_some( ea2);
-        ea2.run_queued_closures();
-      }
-#if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-//      // std::cout << BOOST_CONTEXTOF << std::endl;
-//      {
-//        boost::basic_thread_pool ea1(4);
-//        boost::generic_serial_executor ea2(ea1);
-//        submit_some(ea2);
-//      }
-      // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::basic_thread_pool ea1(4);
-        boost::serial_executor<boost::basic_thread_pool> ea2(ea1);
-        submit_some3(ea2);
-      }
-#endif
-      // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::inline_executor ea1;
-        submit_some(ea1);
-      }
-      // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        //boost::thread_executor ea1;
-        //submit_some(ea1);
-      }
-      // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::basic_thread_pool  ea(4, at_th_entry);
-        boost::future<int> t1 = boost::async(ea, &f1);
-        // std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-      }
-    }
-    catch (std::exception& ex)
-    {
-      std::cout << "ERROR= " << ex.what() << "" << std::endl;
-      return 1;
-    }
-    catch (...)
-    {
-      std::cout << " ERROR= exception thrown" << std::endl;
-      return 2;
-    }
-  }
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  return 0;
-}
-
-
-int main()
-{
-  return test_generic_executor();
-
-
-}

example/generic_executor_ref.cpp

@@ -17,12 +17,11 @@
 #include <boost/thread/caller_context.hpp>
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/thread/executors/loop_executor.hpp>
-#include <boost/thread/executors/generic_serial_executor.hpp>
+#include <boost/thread/executors/serial_executor.hpp>
 #include <boost/thread/executors/inline_executor.hpp>
 #include <boost/thread/executors/thread_executor.hpp>
 #include <boost/thread/executors/executor.hpp>
 #include <boost/thread/executors/executor_adaptor.hpp>
-#include <boost/thread/executors/generic_executor_ref.hpp>
 #include <boost/thread/executor.hpp>
 #include <boost/thread/future.hpp>
 #include <boost/assert.hpp>
@@ -65,7 +64,7 @@ void submit_some(boost::generic_executor_ref tp)
 
 }
 
-void at_th_entry(boost::basic_thread_pool)
+void at_th_entry(boost::basic_thread_pool& )
 {
 
 }
@@ -109,7 +108,7 @@ int test_generic_executor_ref()
       // std::cout << BOOST_CONTEXTOF << std::endl;
       {
         boost::basic_thread_pool ea1(4);
-        boost::generic_serial_executor ea2(ea1);
+        boost::serial_executor ea2(ea1);
         submit_some(ea2);
       }
 #endif

example/generic_serial_executor.cpp

@@ -1,117 +0,0 @@
-// Copyright (C) 2015 Vicente J. Botet Escriba
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/config.hpp>
-#if ! defined  BOOST_NO_CXX11_DECLTYPE
-#define BOOST_RESULT_OF_USE_DECLTYPE
-#endif
-
-#define BOOST_THREAD_VERSION 4
-#define BOOST_THREAD_PROVIDES_EXECUTORS
-//#define BOOST_THREAD_USES_LOG
-#define BOOST_THREAD_USES_LOG_THREAD_ID
-#define BOOST_THREAD_QUEUE_DEPRECATE_OLD
-
-#include <boost/thread/caller_context.hpp>
-#include <boost/thread/executors/basic_thread_pool.hpp>
-#include <boost/thread/executors/generic_serial_executor.hpp>
-#include <boost/thread/executors/executor.hpp>
-#include <boost/thread/executors/executor_adaptor.hpp>
-#include <boost/thread/executor.hpp>
-#include <boost/thread/future.hpp>
-#include <boost/assert.hpp>
-#include <string>
-#include <iostream>
-
-void p1()
-{
-  std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::milliseconds(30));
-  std::cout << BOOST_CONTEXTOF << std::endl;
-}
-
-void p2()
-{
-  std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::milliseconds(10));
-  std::cout << BOOST_CONTEXTOF << std::endl;
-}
-
-int f1()
-{
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::seconds(1));
-  return 1;
-}
-int f2(int i)
-{
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::seconds(2));
-  return i + 1;
-}
-
-void submit_some(boost::generic_serial_executor& tp)
-{
-  //std::cout << BOOST_CONTEXTOF << std::endl;
-  for (int i = 0; i < 3; ++i) {
-    //std::cout << BOOST_CONTEXTOF << std::endl;
-    tp.submit(&p2);
-  }
-  for (int i = 0; i < 3; ++i) {
-    //std::cout << BOOST_CONTEXTOF << std::endl;
-    tp.submit(&p1);
-  }
-  //std::cout << BOOST_CONTEXTOF << std::endl;
-}
-
-
-void at_th_entry(boost::basic_thread_pool )
-{
-
-}
-
-int test_executor_adaptor()
-{
-  std::cout << BOOST_CONTEXTOF << std::endl;
-  {
-     boost::basic_thread_pool tp;
-     boost::generic_serial_executor e1(tp);
-     boost::generic_serial_executor e2 = e1;
-  }
-  std::cout << BOOST_CONTEXTOF << std::endl;
-  {
-    try
-    {
-
-#if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::basic_thread_pool ea1(4);
-        boost::generic_serial_executor ea2(ea1);
-        submit_some(ea2);
-      }
-#endif
-      // std::cout << BOOST_CONTEXTOF << std::endl;
-    }
-    catch (std::exception& ex)
-    {
-      std::cout << "ERROR= " << ex.what() << "" << std::endl;
-      return 1;
-    }
-    catch (...)
-    {
-      std::cout << " ERROR= exception thrown" << std::endl;
-      return 2;
-    }
-  }
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  return 0;
-}
-
-
-int main()
-{
-  return test_executor_adaptor();
-}

example/generic_serial_executor_cont.cpp

@@ -1,118 +0,0 @@
-// Copyright (C) 2015 Vicente J. Botet Escriba
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/config.hpp>
-#if ! defined  BOOST_NO_CXX11_DECLTYPE
-#define BOOST_RESULT_OF_USE_DECLTYPE
-#endif
-
-#define BOOST_THREAD_VERSION 4
-#define BOOST_THREAD_PROVIDES_EXECUTORS
-//#define BOOST_THREAD_USES_LOG
-#define BOOST_THREAD_USES_LOG_THREAD_ID
-#define BOOST_THREAD_QUEUE_DEPRECATE_OLD
-
-#include <boost/thread/caller_context.hpp>
-#include <boost/thread/executors/basic_thread_pool.hpp>
-#include <boost/thread/executors/generic_serial_executor_cont.hpp>
-#include <boost/thread/executors/executor.hpp>
-#include <boost/thread/executors/executor_adaptor.hpp>
-#include <boost/thread/executor.hpp>
-#include <boost/thread/future.hpp>
-#include <boost/assert.hpp>
-#include <string>
-#include <iostream>
-
-void p1()
-{
-  std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::milliseconds(30));
-  std::cout << BOOST_CONTEXTOF << std::endl;
-}
-
-void p2()
-{
-  std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::milliseconds(10));
-  std::cout << BOOST_CONTEXTOF << std::endl;
-}
-
-int f1()
-{
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::seconds(1));
-  return 1;
-}
-int f2(int i)
-{
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  boost::this_thread::sleep_for(boost::chrono::seconds(2));
-  return i + 1;
-}
-
-void submit_some(boost::generic_serial_executor_cont& tp)
-{
-  //std::cout << BOOST_CONTEXTOF << std::endl;
-  for (int i = 0; i < 3; ++i) {
-    //std::cout << BOOST_CONTEXTOF << std::endl;
-    tp.submit(&p2);
-  }
-  for (int i = 0; i < 3; ++i) {
-    //std::cout << BOOST_CONTEXTOF << std::endl;
-    tp.submit(&p1);
-  }
-  //std::cout << BOOST_CONTEXTOF << std::endl;
-
-}
-
-
-void at_th_entry(boost::basic_thread_pool)
-{
-
-}
-
-int test_executor_adaptor()
-{
-  std::cout << BOOST_CONTEXTOF << std::endl;
-  {
-     boost::basic_thread_pool tp;
-     boost::generic_serial_executor_cont e1(tp);
-     boost::generic_serial_executor_cont e2 = e1;
-  }
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  {
-    try
-    {
-
-#if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::basic_thread_pool ea1(4);
-        boost::generic_serial_executor_cont ea2(ea1);
-        submit_some(ea2);
-      }
-#endif
-      // std::cout << BOOST_CONTEXTOF << std::endl;
-    }
-    catch (std::exception& ex)
-    {
-      std::cout << "ERROR= " << ex.what() << "" << std::endl;
-      return 1;
-    }
-    catch (...)
-    {
-      std::cout << " ERROR= exception thrown" << std::endl;
-      return 2;
-    }
-  }
-  // std::cout << BOOST_CONTEXTOF << std::endl;
-  return 0;
-}
-
-
-int main()
-{
-  return test_executor_adaptor();
-}

example/make_future.cpp

@@ -94,11 +94,6 @@ int main()
     f.get();
   }
 #endif
-  {
-    std::cout << __FILE__ << " "<< __LINE__ << std::endl;
-    boost::future<int> f = compute(-1);
-    f.wait();
-  }
   {
     std::cout << __FILE__ << " "<< __LINE__ << std::endl;
     boost::future<int> f = compute(0);
@@ -129,11 +124,11 @@ int main()
     boost::future<int const&> f = boost::make_ready_future(boost::cref(i));
     std::cout << f.get() << std::endl;
   }
-  {
-    std::cout << __FILE__ << " "<< __LINE__ << std::endl;
-    boost::future<int> f = compute(2);
-    std::cout << f.get() << std::endl;
-  }
+//  {
+//    std::cout << __FILE__ << " "<< __LINE__ << std::endl;
+//    boost::future<int> f = compute(2);
+//    std::cout << f.get() << std::endl;
+//  }
   {
     std::cout << __FILE__ << " "<< __LINE__ << std::endl;
     boost::shared_future<int> f = shared_compute(0);

example/producer_consumer.cpp

@@ -24,7 +24,7 @@
 #endif
 #include <boost/thread/concurrent_queues/sync_queue.hpp>
 
-void producer(the_ostream & /*mos*/, boost::sync_queue<int> & sbq)
+void producer(the_ostream &mos, boost::sync_queue<int> & sbq)
 {
   using namespace boost;
   try {
@@ -32,22 +32,22 @@ void producer(the_ostream & /*mos*/, boost::sync_queue<int> & sbq)
     {
       sbq.push(i);
       //sbq << i;
-      //mos << "push(" << i << ") "<< sbq.size()<<"\n";
+      mos << "push(" << i << ") "<< sbq.size()<<"\n";
       this_thread::sleep_for(chrono::milliseconds(200));
     }
   }
   catch(sync_queue_is_closed&)
   {
-    //mos << "closed !!!\n";
+    mos << "closed !!!\n";
   }
   catch(...)
   {
-    //mos << "exception !!!\n";
+    mos << "exception !!!\n";
   }
 }
 
 void consumer(
-    the_ostream & /*mos*/,
+    the_ostream &mos,
     boost::sync_queue<int> & sbq)
 {
   using namespace boost;
@@ -57,21 +57,21 @@ void consumer(
       int r;
       sbq.pull(r);
       //sbq >> r;
-      //mos << i << " pull(" << r << ") "<< sbq.size()<<"\n";
+      mos << i << " pull(" << r << ") "<< sbq.size()<<"\n";
 
       this_thread::sleep_for(chrono::milliseconds(250));
     }
   }
   catch(sync_queue_is_closed&)
   {
-    //mos << "closed !!!\n";
+    mos << "closed !!!\n";
   }
   catch(...)
   {
-    //mos << "exception !!!\n";
+    mos << "exception !!!\n";
   }
 }
-void consumer2(the_ostream &/*mos*/, boost::sync_queue<int> & sbq)
+void consumer2(the_ostream &mos, boost::sync_queue<int> & sbq)
 {
   using namespace boost;
   try {
@@ -81,17 +81,17 @@ void consumer2(the_ostream &/*mos*/, boost::sync_queue<int> & sbq)
       queue_op_status st = sbq.try_pull(r);
       if (queue_op_status::closed == st) break;
       if (queue_op_status::success == st) {
-        //mos << i << " pull(" << r << ")\n";
+        mos << i << " pull(" << r << ")\n";
       }
       this_thread::sleep_for(chrono::milliseconds(250));
     }
   }
   catch(...)
   {
-    //mos << "exception !!!\n";
+    mos << "exception !!!\n";
   }
 }
-void consumer3(the_ostream &/*mos*/, boost::sync_queue<int> & sbq)
+void consumer3(the_ostream &mos, boost::sync_queue<int> & sbq)
 {
   using namespace boost;
   try {
@@ -100,13 +100,13 @@ void consumer3(the_ostream &/*mos*/, boost::sync_queue<int> & sbq)
       int r;
       queue_op_status res = sbq.wait_pull(r);
       if (res==queue_op_status::closed) break;
-      //mos << i << " wait_pull(" << r << ")\n";
+      mos << i << " wait_pull(" << r << ")\n";
       this_thread::sleep_for(chrono::milliseconds(250));
     }
   }
   catch(...)
   {
-    //mos << "exception !!!\n";
+    mos << "exception !!!\n";
   }
 }
 

example/producer_consumer2.cpp

@@ -27,7 +27,7 @@
 #include <boost/static_assert.hpp>
 #include <boost/type_traits.hpp>
 
-void producer(the_ostream &/*mos*/, boost::queue_back<int> sbq)
+void producer(the_ostream &mos, boost::queue_back<int> sbq)
 {
   using namespace boost;
   try {
@@ -35,22 +35,22 @@ void producer(the_ostream &/*mos*/, boost::queue_back<int> sbq)
     {
       sbq.push(i);
       //sbq << i;
-      //mos << "push(" << i << ") " << sbq.size() <<"\n";
+      mos << "push(" << i << ") " << sbq.size() <<"\n";
       this_thread::sleep_for(chrono::milliseconds(200));
     }
   }
   catch(sync_queue_is_closed&)
   {
-    //mos << "closed !!!\n";
+    mos << "closed !!!\n";
   }
   catch(...)
   {
-    //mos << "exception !!!\n";
+    mos << "exception !!!\n";
   }
 }
 
 void consumer(
-    the_ostream &/*mos*/,
+    the_ostream &mos,
     boost::queue_front<int> sbq)
 {
   using namespace boost;
@@ -60,21 +60,21 @@ void consumer(
       int r;
       sbq.pull(r);
       //sbq >> r;
-      //mos << i << " pull(" << r << ") " << sbq.size()  <<"\n";
+      mos << i << " pull(" << r << ") " << sbq.size()  <<"\n";
 
       this_thread::sleep_for(chrono::milliseconds(250));
     }
   }
   catch(sync_queue_is_closed&)
   {
-    //mos << "closed !!!\n";
+    mos << "closed !!!\n";
   }
   catch(...)
   {
-    //mos << "exception !!!\n";
+    mos << "exception !!!\n";
   }
 }
-void consumer2(the_ostream &/*mos*/, boost::queue_front<int> sbq)
+void consumer2(the_ostream &mos, boost::queue_front<int> sbq)
 {
   using namespace boost;
   try {
@@ -84,17 +84,17 @@ void consumer2(the_ostream &/*mos*/, boost::queue_front<int> sbq)
       queue_op_status st = sbq.try_pull(r);
       if (queue_op_status::closed == st) break;
       if (queue_op_status::success == st) {
-        //mos << i << " try_pull(" << r << ")\n";
+        mos << i << " try_pull(" << r << ")\n";
       }
       this_thread::sleep_for(chrono::milliseconds(250));
     }
   }
   catch(...)
   {
-    //mos << "exception !!!\n";
+    mos << "exception !!!\n";
   }
 }
-void consumer3(the_ostream &/*mos*/, boost::queue_front<int> sbq)
+void consumer3(the_ostream &mos, boost::queue_front<int> sbq)
 {
   using namespace boost;
   try {
@@ -103,13 +103,13 @@ void consumer3(the_ostream &/*mos*/, boost::queue_front<int> sbq)
       int r;
       queue_op_status res = sbq.wait_pull(r);
       if (res==queue_op_status::closed) break;
-      //mos << i << " wait_pull(" << r << ")\n";
+      mos << i << " wait_pull(" << r << ")\n";
       this_thread::sleep_for(chrono::milliseconds(250));
     }
   }
   catch(...)
   {
-    //mos << "exception !!!\n";
+    mos << "exception !!!\n";
   }
 }
 

example/recursive_mutex.cpp

@@ -32,7 +32,7 @@ counter c;
 
 void change_count()
 {
-    //std::cout << "count == " << c.increment() << std::endl;
+    std::cout << "count == " << c.increment() << std::endl;
 }
 
 int main(int, char*[])

example/serial_executor.cpp

@@ -27,16 +27,16 @@
 
 void p1()
 {
-  //std::cout << BOOST_CONTEXTOF << std::endl;
+  std::cout << BOOST_CONTEXTOF << std::endl;
   boost::this_thread::sleep_for(boost::chrono::milliseconds(30));
-  //std::cout << BOOST_CONTEXTOF << std::endl;
+  std::cout << BOOST_CONTEXTOF << std::endl;
 }
 
 void p2()
 {
-  //std::cout << BOOST_CONTEXTOF << std::endl;
+  std::cout << BOOST_CONTEXTOF << std::endl;
   boost::this_thread::sleep_for(boost::chrono::milliseconds(10));
-  //std::cout << BOOST_CONTEXTOF << std::endl;
+  std::cout << BOOST_CONTEXTOF << std::endl;
 }
 
 int f1()
@@ -51,9 +51,10 @@ int f2(int i)
   boost::this_thread::sleep_for(boost::chrono::seconds(2));
   return i + 1;
 }
-template <class Executor>
-void submit_some(boost::serial_executor<Executor>& tp)
+
+void submit_some(boost::serial_executor& tp)
 {
+  std::cout << BOOST_CONTEXTOF << std::endl;
   for (int i = 0; i < 3; ++i) {
     std::cout << BOOST_CONTEXTOF << std::endl;
     tp.submit(&p2);
@@ -62,6 +63,7 @@ void submit_some(boost::serial_executor<Executor>& tp)
     std::cout << BOOST_CONTEXTOF << std::endl;
     tp.submit(&p1);
   }
+  std::cout << BOOST_CONTEXTOF << std::endl;
 
 }
 
@@ -73,17 +75,21 @@ void at_th_entry(boost::basic_thread_pool& )
 
 int test_executor_adaptor()
 {
+  // std::cout << BOOST_CONTEXTOF << std::endl;
   {
     try
     {
 
 #if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+      // std::cout << BOOST_CONTEXTOF << std::endl;
       {
         boost::basic_thread_pool ea1(4);
-        boost::serial_executor<boost::basic_thread_pool> ea2(ea1);
+        boost::serial_executor ea2(ea1);
         submit_some(ea2);
+        boost::this_thread::sleep_for(boost::chrono::seconds(10));
       }
 #endif
+      // std::cout << BOOST_CONTEXTOF << std::endl;
     }
     catch (std::exception& ex)
     {
@@ -96,6 +102,7 @@ int test_executor_adaptor()
       return 2;
     }
   }
+  // std::cout << BOOST_CONTEXTOF << std::endl;
   return 0;
 }
 

example/serial_executor_cont.cpp

@@ -52,19 +52,18 @@ int f2(int i)
   return i + 1;
 }
 
-template < class Executor>
-void submit_some(boost::serial_executor_cont<Executor>& tp)
+void submit_some(boost::serial_executor_cont& tp)
 {
-  //std::cout << BOOST_CONTEXTOF << std::endl;
+  std::cout << BOOST_CONTEXTOF << std::endl;
   for (int i = 0; i < 3; ++i) {
-    //std::cout << BOOST_CONTEXTOF << std::endl;
+    std::cout << BOOST_CONTEXTOF << std::endl;
     tp.submit(&p2);
   }
   for (int i = 0; i < 3; ++i) {
-    //std::cout << BOOST_CONTEXTOF << std::endl;
+    std::cout << BOOST_CONTEXTOF << std::endl;
     tp.submit(&p1);
   }
-  //std::cout << BOOST_CONTEXTOF << std::endl;
+  std::cout << BOOST_CONTEXTOF << std::endl;
 
 }
 
@@ -85,8 +84,9 @@ int test_executor_adaptor()
       // std::cout << BOOST_CONTEXTOF << std::endl;
       {
         boost::basic_thread_pool ea1(4);
-        boost::serial_executor_cont<boost::basic_thread_pool> ea2(ea1);
+        boost::serial_executor_cont ea2(ea1);
         submit_some(ea2);
+        boost::this_thread::sleep_for(boost::chrono::seconds(10));
       }
 #endif
       // std::cout << BOOST_CONTEXTOF << std::endl;

example/thread_group.cpp

@@ -59,7 +59,6 @@ int main()
     threads.remove_thread(th);
     BOOST_TEST(! threads.is_thread_in(th));
     th->join();
-    delete th;
   }
   {
     {

include/boost/thread/detail/thread.hpp

@@ -173,6 +173,7 @@ namespace boost
     private:
         bool start_thread_noexcept();
         bool start_thread_noexcept(const attributes& attr);
+    //public:
         void start_thread()
         {
           if (!start_thread_noexcept())

include/boost/thread/executors/basic_thread_pool.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Vicente J. Botet Escriba
+// Copyright (C) 2013-2014 Vicente J. Botet Escriba
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -13,16 +13,11 @@
 #include <boost/thread/detail/config.hpp>
 #include <boost/thread/detail/delete.hpp>
 #include <boost/thread/detail/move.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/scoped_thread.hpp>
 #include <boost/thread/concurrent_queues/sync_queue.hpp>
 #include <boost/thread/executors/work.hpp>
 #include <boost/thread/csbl/vector.hpp>
 
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-#include <boost/smart_ptr/enable_shared_from_this.hpp>
-#include <boost/function.hpp>
-
 #include <boost/config/abi_prefix.hpp>
 
 namespace boost
@@ -35,256 +30,125 @@ namespace executors
     /// type-erasure to store the works to do
     typedef  executors::work work;
   private:
+    /// the kind of stored threads are scoped threads to ensure that the threads are joined.
+    /// A move aware vector type
+    typedef scoped_thread<> thread_t;
+    typedef csbl::vector<thread_t> thread_vector;
 
-    struct shared_state : enable_shared_from_this<shared_state> {
-      typedef  executors::work work;
-      /// the kind of stored threads are scoped threads to ensure that the threads are joined.
-      /// A move aware vector type
-      //typedef scoped_thread<> thread_t;
-      typedef thread thread_t;
-      typedef csbl::vector<thread_t> thread_vector;
+    /// the thread safe work queue
+    concurrent::sync_queue<work > work_queue;
+    /// A move aware vector
+    thread_vector threads;
 
-      /// the thread safe work queue
-      concurrent::sync_queue<work > work_queue;
-      /// A move aware vector
-      thread_vector threads;
-      unsigned const thread_count;
-      boost::function<void(basic_thread_pool)> at_thread_entry;
-      friend class basic_thread_pool;
-
-
-    public:
-      /**
-       * Effects: try to execute one task.
-       * Returns: whether a task has been executed.
-       * Throws: whatever the current task constructor throws or the task() throws.
-       */
-      bool try_executing_one()
+  public:
+    /**
+     * Effects: try to execute one task.
+     * Returns: whether a task has been executed.
+     * Throws: whatever the current task constructor throws or the task() throws.
+     */
+    bool try_executing_one()
+    {
+      try
       {
-        try
+        work task;
+        if (work_queue.try_pull(task) == queue_op_status::success)
         {
-          work task;
-          if (work_queue.try_pull(task) == queue_op_status::success)
-          {
-            task();
-            return true;
-          }
-          return false;
+          task();
+          return true;
         }
-        catch (...)
+        return false;
+      }
+      catch (...)
+      {
+        std::terminate();
+        return false;
+      }
+    }
+    /**
+     * Effects: schedule one task or yields
+     * Throws: whatever the current task constructor throws or the task() throws.
+     */
+    void schedule_one_or_yield()
+    {
+        if ( ! try_executing_one())
         {
-          std::terminate();
-          return false;
+          this_thread::yield();
         }
-      }
-      /**
-       * Effects: schedule one task or yields
-       * Throws: whatever the current task constructor throws or the task() throws.
-       */
-      void schedule_one_or_yield()
-      {
-          if ( ! try_executing_one())
-          {
-            this_thread::yield();
-          }
-      }
-    private:
-
-      /**
-       * The main loop of the worker threads
-       */
-      void worker_thread()
-      {
-        // fixme: this call results on segmentation fault
-        //at_thread_entry(basic_thread_pool(this->shared_from_this()));
-        try
-        {
-          for(;;)
-          {
-            work task;
-            queue_op_status st = work_queue.wait_pull(task);
-            if (st == queue_op_status::closed) break;
-            task();
-          }
-        }
-        catch (...)
-        {
-          std::terminate();
-          return;
-        }
-      }
-
-      static void do_nothing_at_thread_entry(basic_thread_pool) {}
-
-      void init()
-      {
-        try
-        {
-          threads.reserve(thread_count);
-          for (unsigned i = 0; i < thread_count; ++i)
-          {
-            thread th (&shared_state::worker_thread, this);
-            threads.push_back(thread_t(boost::move(th)));
-          }
-        }
-        catch (...)
-        {
-          close();
-          throw;
-        }
-      }
-
-    public:
-      /// basic_thread_pool is not copyable.
-      BOOST_THREAD_NO_COPYABLE(shared_state)
-
-      /**
-       * \b Effects: creates a thread pool that runs closures on \c thread_count threads.
-       *
-       * \b Throws: Whatever exception is thrown while initializing the needed resources.
-       */
-      shared_state(unsigned const thread_count = thread::hardware_concurrency()+1)
-      : thread_count(thread_count),
-        at_thread_entry(do_nothing_at_thread_entry)
-      {
-      }
-      /**
-       * \b Effects: creates a thread pool that runs closures on \c thread_count threads
-       * and executes the at_thread_entry function at the entry of each created thread. .
-       *
-       * \b Throws: Whatever exception is thrown while initializing the needed resources.
-       */
-  #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      template <class AtThreadEntry>
-      shared_state( unsigned const thread_count, AtThreadEntry& at_thread_entry)
-      : thread_count(thread_count),
-        at_thread_entry(at_thread_entry)
-      {
-      }
-  #endif
-      shared_state( unsigned const thread_count, void(*at_thread_entry)(basic_thread_pool))
-      : thread_count(thread_count),
-        at_thread_entry(at_thread_entry)
-      {
-      }
-      template <class AtThreadEntry>
-      shared_state( unsigned const thread_count, BOOST_THREAD_FWD_REF(AtThreadEntry) at_thread_entry)
-      : thread_count(thread_count),
-        at_thread_entry(boost::move(at_thread_entry))
-      {
-      }
-      /**
-       * \b Effects: Destroys the thread pool.
-       *
-       * \b Synchronization: The completion of all the closures happen before the completion of the \c basic_thread_pool destructor.
-       */
-      ~shared_state()
-      {
-        // signal to all the worker threads that there will be no more submissions.
-        close();
-        join();
-        // joins all the threads as the threads were scoped_threads
-      }
-
-      /**
-       * \b Effects: join all the threads.
-       */
-      void join()
-      {
-        for (unsigned i = 0; i < threads.size(); ++i)
-        {
-          if (this_thread::get_id() == threads[i].get_id()) continue;
-          threads[i].join();
-        }
-      }
-
-      /**
-       * \b Effects: close the \c basic_thread_pool for submissions.
-       * The worker threads will work until there is no more closures to run.
-       */
-      void close()
-      {
-        work_queue.close();
-      }
-
-      /**
-       * \b Returns: whether the pool is closed for submissions.
-       */
-      bool closed()
-      {
-        return work_queue.closed();
-      }
-
-      /**
-       * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-       *
-       * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-       * If invoked closure throws an exception the \c basic_thread_pool will call \c std::terminate, as is the case with threads.
-       *
-       * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-       *
-       * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
-       * Whatever exception that can be throw while storing the closure.
-       */
-
-  #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      template <typename Closure>
-      void submit(Closure & closure)
-      {
-        work_queue.push(work(closure));
-      }
-  #endif
-      void submit(void (*closure)())
-      {
-        work_queue.push(work(closure));
-      }
-
-      template <typename Closure>
-      void submit(BOOST_THREAD_RV_REF(Closure) closure)
-      {
-        work_queue.push(work(boost::forward<Closure>(closure)));
-      }
-
-      /**
-       * \b Requires: This must be called from an scheduled task.
-       *
-       * \b Effects: reschedule functions until pred()
-       */
-      template <typename Pred>
-      bool reschedule_until(Pred const& pred)
-      {
-        do {
-          if ( ! try_executing_one())
-          {
-            return false;
-          }
-        } while (! pred());
-        return true;
-      }
-    };
+    }
+  private:
 
     /**
-     * \b Effects: creates a thread pool with this shared state.
-     *
-     * \b Throws: Whatever exception is thrown while initializing the needed resources.
+     * The main loop of the worker threads
      */
-    friend struct shared_state;
-    basic_thread_pool(shared_ptr<shared_state> ptr)
-    : pimpl(ptr)
+    void worker_thread()
     {
+      try
+      {
+        for(;;)
+        {
+          work task;
+          queue_op_status st = work_queue.wait_pull(task);
+          if (st == queue_op_status::closed) return;
+          task();
+        }
+      }
+      catch (...)
+      {
+        std::terminate();
+        return;
+      }
     }
+#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+    template <class AtThreadEntry>
+    void worker_thread1(AtThreadEntry& at_thread_entry)
+    {
+      at_thread_entry(*this);
+      worker_thread();
+    }
+#endif
+    void worker_thread2(void(*at_thread_entry)(basic_thread_pool&))
+    {
+      at_thread_entry(*this);
+      worker_thread();
+    }
+    template <class AtThreadEntry>
+    void worker_thread3(BOOST_THREAD_FWD_REF(AtThreadEntry) at_thread_entry)
+    {
+      at_thread_entry(*this);
+      worker_thread();
+    }
+    static void do_nothing_at_thread_entry(basic_thread_pool&) {}
+
   public:
+    /// basic_thread_pool is not copyable.
+    BOOST_THREAD_NO_COPYABLE(basic_thread_pool)
+
     /**
      * \b Effects: creates a thread pool that runs closures on \c thread_count threads.
      *
      * \b Throws: Whatever exception is thrown while initializing the needed resources.
      */
     basic_thread_pool(unsigned const thread_count = thread::hardware_concurrency()+1)
-    : pimpl(make_shared<shared_state>(thread_count))
     {
-      pimpl->init();
+      try
+      {
+        threads.reserve(thread_count);
+        for (unsigned i = 0; i < thread_count; ++i)
+        {
+#if 1
+          thread th (&basic_thread_pool::worker_thread, this);
+          threads.push_back(thread_t(boost::move(th)));
+#else
+          threads.push_back(thread_t(&basic_thread_pool::worker_thread, this)); // do not compile
+#endif
+        }
+      }
+      catch (...)
+      {
+        close();
+        throw;
+      }
     }
-
     /**
      * \b Effects: creates a thread pool that runs closures on \c thread_count threads
      * and executes the at_thread_entry function at the entry of each created thread. .
@@ -294,24 +158,61 @@ namespace executors
 #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     template <class AtThreadEntry>
     basic_thread_pool( unsigned const thread_count, AtThreadEntry& at_thread_entry)
-    : pimpl(make_shared<shared_state>(thread_count, at_thread_entry))
     {
-      pimpl->init();
+      try
+      {
+        threads.reserve(thread_count);
+        for (unsigned i = 0; i < thread_count; ++i)
+        {
+          thread th (&basic_thread_pool::worker_thread1<AtThreadEntry>, this, at_thread_entry);
+          threads.push_back(thread_t(boost::move(th)));
+          //threads.push_back(thread_t(&basic_thread_pool::worker_thread, this)); // do not compile
+        }
+      }
+      catch (...)
+      {
+        close();
+        throw;
+      }
     }
 #endif
-
-    basic_thread_pool( unsigned const thread_count, void(*at_thread_entry)(basic_thread_pool))
-    : pimpl(make_shared<shared_state>(thread_count, at_thread_entry))
+    basic_thread_pool( unsigned const thread_count, void(*at_thread_entry)(basic_thread_pool&))
     {
-      pimpl->init();
+      try
+      {
+        threads.reserve(thread_count);
+        for (unsigned i = 0; i < thread_count; ++i)
+        {
+          thread th (&basic_thread_pool::worker_thread2, this, at_thread_entry);
+          threads.push_back(thread_t(boost::move(th)));
+          //threads.push_back(thread_t(&basic_thread_pool::worker_thread, this)); // do not compile
+        }
+      }
+      catch (...)
+      {
+        close();
+        throw;
+      }
     }
     template <class AtThreadEntry>
     basic_thread_pool( unsigned const thread_count, BOOST_THREAD_FWD_REF(AtThreadEntry) at_thread_entry)
-    : pimpl(make_shared<shared_state>(thread_count, boost::forward<AtThreadEntry>(at_thread_entry)))
     {
-      pimpl->init();
+      try
+      {
+        threads.reserve(thread_count);
+        for (unsigned i = 0; i < thread_count; ++i)
+        {
+          thread th (&basic_thread_pool::worker_thread3<AtThreadEntry>, this, boost::forward<AtThreadEntry>(at_thread_entry));
+          threads.push_back(thread_t(boost::move(th)));
+          //threads.push_back(thread_t(&basic_thread_pool::worker_thread, this)); // do not compile
+        }
+      }
+      catch (...)
+      {
+        close();
+        throw;
+      }
     }
-
     /**
      * \b Effects: Destroys the thread pool.
      *
@@ -319,16 +220,9 @@ namespace executors
      */
     ~basic_thread_pool()
     {
-    }
-
-    /**
-     * Effects: try to execute one task.
-     * Returns: whether a task has been executed.
-     * Throws: whatever the current task constructor throws or the task() throws.
-     */
-    bool try_executing_one()
-    {
-      return pimpl->try_executing_one();
+      // signal to all the worker threads that there will be no more submissions.
+      close();
+      // joins all the threads as the threads were scoped_threads
     }
 
     /**
@@ -336,7 +230,10 @@ namespace executors
      */
     void join()
     {
-      pimpl->join();
+      for (unsigned i = 0; i < threads.size(); ++i)
+      {
+        threads[i].join();
+      }
     }
 
     /**
@@ -345,7 +242,7 @@ namespace executors
      */
     void close()
     {
-      pimpl->close();
+      work_queue.close();
     }
 
     /**
@@ -353,7 +250,7 @@ namespace executors
      */
     bool closed()
     {
-      return pimpl->closed();
+      return work_queue.closed();
     }
 
     /**
@@ -372,18 +269,18 @@ namespace executors
     template <typename Closure>
     void submit(Closure & closure)
     {
-      pimpl->submit(closure);
+      work_queue.push(work(closure));
     }
 #endif
     void submit(void (*closure)())
     {
-      pimpl->submit(closure);
+      work_queue.push(work(closure));
     }
 
     template <typename Closure>
     void submit(BOOST_THREAD_RV_REF(Closure) closure)
     {
-      pimpl->submit(boost::forward<Closure>(closure));
+      work_queue.push(work(boost::forward<Closure>(closure)));
     }
 
     /**
@@ -394,16 +291,15 @@ namespace executors
     template <typename Pred>
     bool reschedule_until(Pred const& pred)
     {
-      return pimpl->reschedule_until(pred);
+      do {
+        if ( ! try_executing_one())
+        {
+          return false;
+        }
+      } while (! pred());
+      return true;
     }
 
-    void schedule_one_or_yield()
-    {
-      return pimpl->schedule_one_or_yield();
-    }
-
-  private:
-    shared_ptr<shared_state> pimpl;
   };
 }
 using executors::basic_thread_pool;

include/boost/thread/executors/detail/priority_executor_base.hpp

@@ -24,6 +24,7 @@ namespace detail
   class priority_executor_base
   {
   public:
+    //typedef boost::function<void()> work;
     typedef executors::work_pq work;
   protected:
     typedef Queue queue_type;

include/boost/thread/executors/executor.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2013,2015 Vicente J. Botet Escriba
+// Copyright (C) 2013,2014 Vicente J. Botet Escriba
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -27,6 +27,8 @@ namespace boost
     /// type-erasure to store the works to do
     typedef  executors::work work;
 
+    /// executor is not copyable.
+    BOOST_THREAD_NO_COPYABLE(executor)
     executor() {}
 
     /**
@@ -126,6 +128,7 @@ namespace boost
     bool reschedule_until(Pred const& pred)
     {
       do {
+        //schedule_one_or_yield();
         if ( ! try_executing_one())
         {
           return false;

include/boost/thread/executors/executor_adaptor.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2013,2015 Vicente J. Botet Escriba
+// Copyright (C) 2013,2014 Vicente J. Botet Escriba
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -30,8 +30,9 @@ namespace executors
     /// type-erasure to store the works to do
     typedef  executor::work work;
 
-//    executor_adaptor(executor_adaptor const&) = default;
-//    executor_adaptor(executor_adaptor &&) = default;
+    /// executor is not copyable.
+    BOOST_THREAD_NO_COPYABLE(executor_adaptor)
+
     /**
      * executor_adaptor constructor
      */

include/boost/thread/executors/generic_executor.hpp

@@ -1,150 +0,0 @@
-// Copyright (C) 2015 Vicente J. Botet Escriba
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_THREAD_EXECUTORS_GENERIC_EXECUTOR_HPP
-#define BOOST_THREAD_EXECUTORS_GENERIC_EXECUTOR_HPP
-
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/thread/detail/delete.hpp>
-#include <boost/thread/detail/move.hpp>
-#include <boost/thread/executors/executor_adaptor.hpp>
-
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-#include <boost/type_traits/decay.hpp>
-
-#include <boost/config/abi_prefix.hpp>
-
-namespace boost
-{
-  namespace executors
-  {
-
-  class generic_executor
-  {
-    shared_ptr<executor> ex;
-  public:
-    /// type-erasure to store the works to do
-    typedef executors::work work;
-
-    //generic_executor(generic_executor const&) = default;
-    //generic_executor(generic_executor &&) = default;
-
-    template<typename Executor>
-    generic_executor(Executor const& ex
-        , typename boost::disable_if<is_same<Executor, generic_executor>,
-          int* >::type =  (int*)0
-    )
-    //: ex(make_shared<executor_adaptor<Executor> >(ex)) // todo check why this doesn't work with C++03
-    : ex( new executor_adaptor<Executor>(ex) )
-    {
-    }
-
-    //generic_executor(generic_executor const& other) noexcept    {}
-    //generic_executor& operator=(generic_executor const& other) noexcept    {}
-
-
-    /**
-     * \par Effects
-     * Close the \c executor for submissions.
-     * The worker threads will work until there is no more closures to run.
-     */
-    void close() { ex->close(); }
-
-    /**
-     * \par Returns
-     * Whether the pool is closed for submissions.
-     */
-    bool closed() { return ex->closed(); }
-
-    void submit(BOOST_THREAD_RV_REF(work) closure)
-    {
-      ex->submit(boost::forward<work>(closure));
-    }
-
-    /**
-     * \par Requires
-     * \c Closure is a model of Callable(void()) and a model of CopyConstructible/MoveConstructible.
-     *
-     * \par Effects
-     * The specified closure will be scheduled for execution at some point in the future.
-     * If invoked closure throws an exception the thread pool will call std::terminate, as is the case with threads.
-     *
-     * \par Synchronization
-     * Completion of closure on a particular thread happens before destruction of thread's thread local variables.
-     *
-     * \par Throws
-     * \c sync_queue_is_closed if the thread pool is closed.
-     * Whatever exception that can be throw while storing the closure.
-     */
-
-#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    template <typename Closure>
-    void submit(Closure & closure)
-    {
-      work w ((closure));
-      submit(boost::move(w));
-    }
-#endif
-    void submit(void (*closure)())
-    {
-      work w ((closure));
-      submit(boost::move(w));
-    }
-
-    template <typename Closure>
-    void submit(BOOST_THREAD_RV_REF(Closure) closure)
-    {
-      work w = boost::move(closure);
-      submit(boost::move(w));
-    }
-
-//    size_t num_pending_closures() const
-//    {
-//      return ex->num_pending_closures();
-//    }
-
-    /**
-     * \par Effects
-     * Try to execute one task.
-     *
-     * \par Returns
-     * Whether a task has been executed.
-     *
-     * \par Throws
-     * Whatever the current task constructor throws or the task() throws.
-     */
-    bool try_executing_one() { return ex->try_executing_one(); }
-
-    /**
-     * \par Requires
-     * This must be called from an scheduled task.
-     *
-     * \par Effects
-     * reschedule functions until pred()
-     */
-    template <typename Pred>
-    bool reschedule_until(Pred const& pred)
-    {
-      do {
-        //schedule_one_or_yield();
-        if ( ! try_executing_one())
-        {
-          return false;
-        }
-      } while (! pred());
-      return true;
-    }
-
-  };
-  }
-  using executors::generic_executor;
-}
-
-#include <boost/config/abi_suffix.hpp>
-
-#endif

include/boost/thread/executors/generic_executor_ref.hpp

@@ -13,8 +13,7 @@
 #include <boost/thread/detail/move.hpp>
 #include <boost/thread/executors/executor.hpp>
 
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include <boost/config/abi_prefix.hpp>
 
@@ -100,8 +99,8 @@ namespace boost
 
     template<typename Executor>
     generic_executor_ref(Executor& ex)
-    //: ex(make_shared<executor_ref<typename decay<Executor>::type> >(ex)) // todo check why this doesn't work with C++03
-    : ex( new executor_ref<typename decay<Executor>::type>(ex) )
+    //: ex(make_shared<executor_ref<Executor> >(ex)) // todo check why this doesn't works with C++03
+    : ex( new executor_ref<Executor>(ex) )
     {
     }
 

include/boost/thread/executors/generic_serial_executor.hpp

@@ -1,284 +0,0 @@
-// Copyright (C) 2013,2015 Vicente J. Botet Escriba
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// 2013/11 Vicente J. Botet Escriba
-//    first implementation of a simple serial scheduler.
-
-#ifndef BOOST_THREAD_GENERIC_SERIAL_EXECUTOR_HPP
-#define BOOST_THREAD_GENERIC_SERIAL_EXECUTOR_HPP
-
-#include <boost/thread/detail/config.hpp>
-#include <boost/thread/detail/delete.hpp>
-#include <boost/thread/detail/move.hpp>
-#include <boost/thread/concurrent_queues/sync_queue.hpp>
-#include <boost/thread/executors/work.hpp>
-#include <boost/thread/executors/generic_executor.hpp>
-#include <boost/thread/future.hpp>
-#include <boost/thread/scoped_thread.hpp>
-
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/decay.hpp>
-
-#include <boost/thread/caller_context.hpp>
-
-#include <boost/config/abi_prefix.hpp>
-
-namespace boost
-{
-namespace executors
-{
-  class generic_serial_executor
-  {
-  public:
-    /// type-erasure to store the works to do
-    typedef  executors::work work;
-  private:
-
-    struct shared_state {
-      typedef  executors::work work;
-      typedef  scoped_thread<> thread_t;
-
-      /// the thread safe work queue
-      concurrent::sync_queue<work > work_queue;
-      generic_executor ex;
-      thread_t thr;
-
-      struct try_executing_one_task {
-        work& task;
-        boost::promise<void> &p;
-        try_executing_one_task(work& task, boost::promise<void> &p)
-        : task(task), p(p) {}
-        void operator()() {
-          try {
-            task();
-            p.set_value();
-          } catch (...)
-          {
-            p.set_exception(current_exception());
-          }
-        }
-      };
-    public:
-      /**
-       * \par Returns
-       * The underlying executor wrapped on a generic executor reference.
-       */
-      generic_executor& underlying_executor() BOOST_NOEXCEPT { return ex; }
-
-    private:
-
-      /**
-       * The main loop of the worker thread
-       */
-      void worker_thread()
-      {
-        try
-        {
-          for(;;)
-          {
-            work task;
-            queue_op_status st = work_queue.wait_pull(task);
-            if (st == queue_op_status::closed) return;
-
-            boost::promise<void> p;
-            try_executing_one_task tmp(task,p);
-            ex.submit(tmp);
-            p.get_future().wait();
-          }
-        }
-        catch (...)
-        {
-          std::terminate();
-          return;
-        }
-      }
-
-    public:
-      /// shared_state is not copyable.
-      BOOST_THREAD_NO_COPYABLE(shared_state)
-
-      /**
-       * \b Effects: creates a thread pool that runs closures using one of its closure-executing methods.
-       *
-       * \b Throws: Whatever exception is thrown while initializing the needed resources.
-       */
-      template <class Executor>
-      shared_state(Executor const& ex)
-      : ex(ex), thr(&shared_state::worker_thread, this)
-      {
-      }
-      /**
-       * \b Effects: Destroys the thread pool.
-       *
-       * \b Synchronization: The completion of all the closures happen before the completion of the \c shared_state destructor.
-       */
-      ~shared_state()
-      {
-        // signal to the worker thread that there will be no more submissions.
-        close();
-      }
-
-      /**
-       * \b Effects: close the \c generic_serial_executor for submissions.
-       * The loop will work until there is no more closures to run.
-       */
-      void close()
-      {
-        work_queue.close();
-      }
-
-      /**
-       * \b Returns: whether the pool is closed for submissions.
-       */
-      bool closed()
-      {
-        return work_queue.closed();
-      }
-
-      /**
-       * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-       *
-       * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-       * If invoked closure throws an exception the \c generic_serial_executor will call \c std::terminate, as is the case with threads.
-       *
-       * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-       *
-       * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
-       * Whatever exception that can be throw while storing the closure.
-       */
-
-  #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      template <typename Closure>
-      void submit(Closure & closure)
-      {
-        work_queue.push(work(closure));
-      }
-  #endif
-      void submit(void (*closure)())
-      {
-        work_queue.push(work(closure));
-      }
-
-      template <typename Closure>
-      void submit(BOOST_THREAD_RV_REF(Closure) closure)
-      {
-        work_queue.push(work(boost::forward<Closure>(closure)));
-      }
-
-    };
-
-  public:
-
-//    generic_serial_executor(generic_serial_executor const&) = default;
-//    generic_serial_executor(generic_serial_executor &&) = default;
-
-    /**
-     * \b Effects: creates a thread pool that runs closures using one of its closure-executing methods.
-     *
-     * \b Throws: Whatever exception is thrown while initializing the needed resources.
-     */
-    template <class Executor>
-    generic_serial_executor(Executor const& ex
-        , typename boost::disable_if<is_same<Executor, generic_serial_executor>,
-          int* >::type =  (int*)0)
-    : pimpl(make_shared<shared_state>(ex))
-    {
-    }
-    /**
-     * \b Effects: Destroys the thread pool.
-     *
-     * \b Synchronization: The completion of all the closures happen before the completion of the \c generic_serial_executor destructor.
-     */
-    ~generic_serial_executor()
-    {
-    }
-
-    /**
-     * \par Returns
-     * The underlying executor wrapped on a generic executor reference.
-     */
-    generic_executor& underlying_executor() BOOST_NOEXCEPT
-    {
-      return pimpl->underlying_executor();
-    }
-
-    /**
-     * \b Returns: always false as a serial executor can not re-enter.
-     * Remark: A serial executor can not execute one of its pending tasks as the tasks depends on the other tasks.
-     */
-    bool try_executing_one()
-    {
-      return false;
-    }
-
-    /**
-     * \b Effects: close the \c generic_serial_executor for submissions.
-     * The loop will work until there is no more closures to run.
-     */
-    void close()
-    {
-      pimpl->close();
-    }
-
-    /**
-     * \b Returns: whether the pool is closed for submissions.
-     */
-    bool closed()
-    {
-      return pimpl->closed();
-    }
-
-    /**
-     * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-     *
-     * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-     * If invoked closure throws an exception the \c generic_serial_executor will call \c std::terminate, as is the case with threads.
-     *
-     * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-     *
-     * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
-     * Whatever exception that can be throw while storing the closure.
-     */
-
-#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    template <typename Closure>
-    void submit(Closure & closure)
-    {
-      pimpl->submit(closure);
-    }
-#endif
-    void submit(void (*closure)())
-    {
-      pimpl->submit(closure);
-    }
-
-    template <typename Closure>
-    void submit(BOOST_THREAD_RV_REF(Closure) closure)
-    {
-      pimpl->submit(boost::forward<Closure>(closure));
-    }
-
-    /**
-     * \b Returns: always false as a serial executor can not re-enter.
-     * Remark: A serial executor can not execute one of its pending tasks as the tasks depends on the other tasks.
-     */
-    template <typename Pred>
-    bool reschedule_until(Pred const& pred)
-    {
-      return false;
-    }
-  private:
-    shared_ptr<shared_state> pimpl;
-  };
-}
-using executors::generic_serial_executor;
-}
-
-#include <boost/config/abi_suffix.hpp>
-
-#endif

include/boost/thread/executors/generic_serial_executor_cont.hpp

@@ -1,265 +0,0 @@
-// Copyright (C) 2015 Vicente J. Botet Escriba
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// 2013/11 Vicente J. Botet Escriba
-//    first implementation of a simple serial scheduler.
-
-#ifndef BOOST_THREAD_GENERIC_SERIAL_EXECUTOR_CONT_HPP
-#define BOOST_THREAD_GENERIC_SERIAL_EXECUTOR_CONT_HPP
-
-#include <boost/thread/detail/config.hpp>
-#include <boost/thread/detail/delete.hpp>
-#include <boost/thread/detail/move.hpp>
-#include <boost/thread/executors/work.hpp>
-#include <boost/thread/executors/generic_executor.hpp>
-#include <boost/thread/future.hpp>
-#include <boost/thread/scoped_thread.hpp>
-
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/decay.hpp>
-
-#include <boost/config/abi_prefix.hpp>
-
-namespace boost
-{
-namespace executors
-{
-  class generic_serial_executor_cont
-  {
-  public:
-    /// type-erasure to store the works to do
-    typedef  executors::work work;
-  private:
-
-    struct shared_state {
-      typedef  executors::work work;
-
-    generic_executor ex_;
-    future<void> fut_; // protected by mtx_
-    bool closed_; // protected by mtx_
-    mutex mtx_;
-
-    struct continuation {
-      work task;
-      template <class X>
-      struct result {
-        typedef void type;
-      };
-      continuation(BOOST_THREAD_RV_REF(work) tsk)
-      : task(boost::move(tsk)) {}
-      void operator()(future<void> f)
-      {
-        try {
-          task();
-        } catch (...)  {
-          std::terminate();
-        }
-      }
-    };
-
-    bool closed(lock_guard<mutex>&) const
-    {
-      return closed_;
-    }
-  public:
-    /**
-     * \par Returns
-     * The underlying executor wrapped on a generic executor reference.
-     */
-    generic_executor& underlying_executor() BOOST_NOEXCEPT { return ex_; }
-
-    /// shared_state is not copyable.
-    BOOST_THREAD_NO_COPYABLE(shared_state)
-
-    /**
-     * \b Effects: creates a serial executor that runs closures in fifo order using one the associated executor.
-     *
-     * \b Throws: Whatever exception is thrown while initializing the needed resources.
-     *
-     * \b Notes:
-     * * The lifetime of the associated executor must outlive the serial executor.
-     * * The current implementation doesn't support submission from synchronous continuation, that is,
-     *     - the executor must execute the continuation asynchronously or
-     *     - the continuation can not submit to this serial executor.
-     */
-    template <class Executor>
-    shared_state(Executor const& ex)
-    : ex_(ex), fut_(make_ready_future()), closed_(false)
-    {
-    }
-    /**
-     * \b Effects: Destroys the thread pool.
-     *
-     * \b Synchronization: The completion of all the closures happen before the completion of the \c generic_serial_executor_cont destructor.
-     */
-    ~shared_state()
-    {
-      // signal to the worker thread that there will be no more submissions.
-      close();
-    }
-
-    /**
-     * \b Effects: close the \c generic_serial_executor_cont for submissions.
-     * The loop will work until there is no more closures to run.
-     */
-    void close()
-    {
-      lock_guard<mutex> lk(mtx_);
-      closed_ = true;;
-    }
-
-    /**
-     * \b Returns: whether the pool is closed for submissions.
-     */
-    bool closed()
-    {
-      lock_guard<mutex> lk(mtx_);
-      return closed(lk);
-    }
-
-    /**
-     * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-     *
-     * \b Effects: The specified \c closure will be scheduled for execution after the last submitted closure finish.
-     * If the invoked closure throws an exception the \c generic_serial_executor_cont will call \c std::terminate, as is the case with threads.
-     *
-     * \b Throws: \c sync_queue_is_closed if the executor is closed.
-     * Whatever exception that can be throw while storing the closure.
-     *
-     */
-
-#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    template <typename Closure>
-    void submit(Closure & closure)
-    {
-      lock_guard<mutex> lk(mtx_);
-      if (closed(lk))       BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-      fut_ = fut_.then(ex_, continuation(work(closure)));
-    }
-#endif
-    void submit(void (*closure)())
-    {
-      lock_guard<mutex> lk(mtx_);
-      if (closed(lk))       BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-      fut_ = fut_.then(ex_, continuation(work(closure)));
-    }
-
-    template <typename Closure>
-    void submit(BOOST_THREAD_RV_REF(Closure) closure)
-    {
-      lock_guard<mutex> lk(mtx_);
-      if (closed(lk))       BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-      fut_ = fut_.then(ex_, continuation(work(boost::forward<Closure>(closure))));
-    }
-    };
-  public:
-    /**
-     * \b Effects: creates a thread pool that runs closures using one of its closure-executing methods.
-     *
-     * \b Throws: Whatever exception is thrown while initializing the needed resources.
-     */
-    template <class Executor>
-    generic_serial_executor_cont(Executor const& ex
-                , typename boost::disable_if<is_same<Executor, generic_serial_executor_cont>,
-                  int* >::type =  (int*)0)
-    : pimpl(make_shared<shared_state>(ex))
-    {
-    }
-    /**
-     * \b Effects: Destroys the thread pool.
-     *
-     * \b Synchronization: The completion of all the closures happen before the completion of the \c serial_executor destructor.
-     */
-    ~generic_serial_executor_cont()
-    {
-    }
-
-    /**
-     * \par Returns
-     * The underlying executor wrapped on a generic executor reference.
-     */
-    generic_executor& underlying_executor() BOOST_NOEXCEPT
-    {
-      return pimpl->underlying_executor();
-    }
-
-    /**
-     * \b Returns: always false as a serial executor can not re-enter.
-     * Remark: A serial executor can not execute one of its pending tasks as the tasks depends on the other tasks.
-     */
-    bool try_executing_one()
-    {
-      return false;
-    }
-
-    /**
-     * \b Effects: close the \c serial_executor for submissions.
-     * The loop will work until there is no more closures to run.
-     */
-    void close()
-    {
-      pimpl->close();
-    }
-
-    /**
-     * \b Returns: whether the pool is closed for submissions.
-     */
-    bool closed()
-    {
-      return pimpl->closed();
-    }
-
-    /**
-     * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-     *
-     * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-     * If invoked closure throws an exception the \c serial_executor will call \c std::terminate, as is the case with threads.
-     *
-     * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-     *
-     * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
-     * Whatever exception that can be throw while storing the closure.
-     */
-
-#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    template <typename Closure>
-    void submit(Closure & closure)
-    {
-      pimpl->submit(closure);
-    }
-#endif
-    void submit(void (*closure)())
-    {
-      pimpl->submit(closure);
-    }
-
-    template <typename Closure>
-    void submit(BOOST_THREAD_RV_REF(Closure) closure)
-    {
-      pimpl->submit(boost::forward<Closure>(closure));
-    }
-
-    /**
-     * \b Returns: always false as a serial executor can not re-enter.
-     * Remark: A serial executor can not execute one of its pending tasks as the tasks depends on the other tasks.
-     */
-    template <typename Pred>
-    bool reschedule_until(Pred const& pred)
-    {
-      return false;
-    }
-  private:
-    shared_ptr<shared_state> pimpl;
-  };
-}
-using executors::generic_serial_executor_cont;
-}
-
-#include <boost/config/abi_suffix.hpp>
-
-#endif

include/boost/thread/executors/inline_executor.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Vicente J. Botet Escriba
+// Copyright (C) 2014 Vicente J. Botet Escriba
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,9 +14,6 @@
 #include <boost/thread/detail/move.hpp>
 #include <boost/thread/executors/work.hpp>
 
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-
 #include <boost/config/abi_prefix.hpp>
 
 namespace boost
@@ -28,227 +25,142 @@ namespace executors
   public:
     /// type-erasure to store the works to do
     typedef  executors::work work;
-  private:
+    bool closed_;
+    mutable mutex mtx_;
+    /**
+     * Effects: try to execute one task.
+     * Returns: whether a task has been executed.
+     * Throws: whatever the current task constructor throws or the task() throws.
+     */
+    bool try_executing_one()
+    {
+      return false;
+    }
 
-    struct shared_state {
-      typedef  executors::work work;
-
-      bool closed_;
-      mutable mutex mtx_;
-
-      /**
-       * Effects: try to execute one task.
-       * Returns: whether a task has been executed.
-       * Throws: whatever the current task constructor throws or the task() throws.
-       */
-      bool try_executing_one()
-      {
-        return false;
-      }
-
-      /// shared_state is not copyable.
-      BOOST_THREAD_NO_COPYABLE(shared_state)
-
-      /**
-       * \b Effects: creates a inline executor that runs closures immediately.
-       *
-       * \b Throws: Nothing.
-       */
-      shared_state()
-      : closed_(false)
-      {
-      }
-      /**
-       * \b Effects: Destroys the inline executor.
-       *
-       * \b Synchronization: The completion of all the closures happen before the completion of the \c inline_executor destructor.
-       */
-      ~shared_state()
-      {
-        // signal to all the worker thread that there will be no more submissions.
-        close();
-      }
-
-      /**
-       * \b Effects: close the \c inline_executor for submissions.
-       * The loop will work until there is no more closures to run.
-       */
-      void close()
-      {
-        lock_guard<mutex> lk(mtx_);
-        closed_ = true;
-      }
-
-      /**
-       * \b Returns: whether the pool is closed for submissions.
-       */
-      bool closed(lock_guard<mutex>& )  const
-      {
-        return closed_;
-      }
-      bool closed() const
-      {
-        lock_guard<mutex> lk(mtx_);
-        return closed(lk);
-      }
-
-      /**
-       * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-       *
-       * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-       * If invoked closure throws an exception the \c inline_executor will call \c std::terminate, as is the case with threads.
-       *
-       * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-       *
-       * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
-       * Whatever exception that can be throw while storing the closure.
-       */
-
-  #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      template <typename Closure>
-      void submit(Closure & closure)
-      {
-        {
-          lock_guard<mutex> lk(mtx_);
-          if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-        }
-        try
-        {
-          closure();
-        }
-        catch (...)
-        {
-          std::terminate();
-          return;
-        }
-      }
-  #endif
-      void submit(void (*closure)())
-      {
-        {
-          lock_guard<mutex> lk(mtx_);
-          if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-        }
-        try
-        {
-          closure();
-        }
-        catch (...)
-        {
-          std::terminate();
-          return;
-        }
-      }
-
-      template <typename Closure>
-      void submit(BOOST_THREAD_FWD_REF(Closure) closure)
-      {
-        {
-          lock_guard<mutex> lk(mtx_);
-          if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-        }
-        try
-        {
-          closure();
-        }
-        catch (...)
-        {
-          std::terminate();
-          return;
-        }
-      }
-
-      /**
-       * \b Requires: This must be called from an scheduled task.
-       *
-       * \b Effects: reschedule functions until pred()
-       */
-      template <typename Pred>
-      bool reschedule_until(Pred const& )
-      {
-        return false;
-      }
-  };
   public:
-  /**
-   * \b Effects: creates a inline executor that runs closures immediately.
-   *
-   * \b Throws: Nothing.
-   */
-  inline_executor()
-  : pimpl(make_shared<shared_state>())
-  {
-  }
+    /// inline_executor is not copyable.
+    BOOST_THREAD_NO_COPYABLE(inline_executor)
 
-  /**
-   * \b Effects: close the \c inline_executor for submissions.
-   * The loop will work until there is no more closures to run.
-   */
-  void close()
-  {
-    pimpl->close();
-  }
+    /**
+     * \b Effects: creates a inline executor that runs closures immediately.
+     *
+     * \b Throws: Nothing.
+     */
+    inline_executor()
+    : closed_(false)
+    {
+    }
+    /**
+     * \b Effects: Destroys the inline executor.
+     *
+     * \b Synchronization: The completion of all the closures happen before the completion of the \c inline_executor destructor.
+     */
+    ~inline_executor()
+    {
+      // signal to all the worker thread that there will be no more submissions.
+      close();
+    }
 
-  /**
-   * \b Returns: whether the executor is closed for submissions.
-   */
-  bool closed() const
-  {
-    return pimpl->closed();
-  }
+    /**
+     * \b Effects: close the \c inline_executor for submissions.
+     * The loop will work until there is no more closures to run.
+     */
+    void close()
+    {
+      lock_guard<mutex> lk(mtx_);
+      closed_ = true;
+    }
 
-  /**
-   * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-   *
-   * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-   * If invoked closure throws an exception the \c inline_executor will call \c std::terminate, as is the case with threads.
-   *
-   * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-   *
-   * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
-   * Whatever exception that can be throw while storing the closure.
-   */
+    /**
+     * \b Returns: whether the pool is closed for submissions.
+     */
+    bool closed(lock_guard<mutex>& )
+    {
+      return closed_;
+    }
+    bool closed()
+    {
+      lock_guard<mutex> lk(mtx_);
+      return closed(lk);
+    }
+
+    /**
+     * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
+     *
+     * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
+     * If invoked closure throws an exception the \c inline_executor will call \c std::terminate, as is the case with threads.
+     *
+     * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
+     *
+     * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
+     * Whatever exception that can be throw while storing the closure.
+     */
 
 #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-  template <typename Closure>
-  void submit(Closure & closure)
-  {
-    pimpl->submit(closure);
-  }
+    template <typename Closure>
+    void submit(Closure & closure)
+    {
+      {
+        lock_guard<mutex> lk(mtx_);
+        if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
+      }
+      try
+      {
+        closure();
+      }
+      catch (...)
+      {
+        std::terminate();
+        return;
+      }
+    }
 #endif
-  void submit(void (*closure)())
-  {
-    pimpl->submit(closure);
-  }
+    void submit(void (*closure)())
+    {
+      {
+        lock_guard<mutex> lk(mtx_);
+        if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
+      }
+      try
+      {
+        closure();
+      }
+      catch (...)
+      {
+        std::terminate();
+        return;
+      }
+    }
 
-  template <typename Closure>
-  void submit(BOOST_THREAD_FWD_REF(Closure) closure)
-  {
-    pimpl->submit(boost::forward<Closure>(closure));
-  }
+    template <typename Closure>
+    void submit(BOOST_THREAD_FWD_REF(Closure) closure)
+    {
+      {
+        lock_guard<mutex> lk(mtx_);
+        if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
+      }
+      try
+      {
+        closure();
+      }
+      catch (...)
+      {
+        std::terminate();
+        return;
+      }
+    }
 
-  /**
-   * Effects: try to execute one task.
-   * Returns: whether a task has been executed.
-   * Throws: whatever the current task constructor throws or the task() throws.
-   */
-  bool try_executing_one()
-  {
-    return pimpl->try_executing_one();
-  }
+    /**
+     * \b Requires: This must be called from an scheduled task.
+     *
+     * \b Effects: reschedule functions until pred()
+     */
+    template <typename Pred>
+    bool reschedule_until(Pred const& )
+    {
+      return false;
+    }
 
-  /**
-   * \b Requires: This must be called from an scheduled task.
-   *
-   * \b Effects: reschedule functions until pred()
-   */
-  template <typename Pred>
-  bool reschedule_until(Pred const& p)
-  {
-    return pimpl->reschedule_until(p);
-  }
-  private:
-    shared_ptr<shared_state> pimpl;
   };
 }
 using executors::inline_executor;

include/boost/thread/executors/loop_executor.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Vicente J. Botet Escriba
+// Copyright (C) 2013,2014 Vicente J. Botet Escriba
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,9 +17,6 @@
 #include <boost/thread/concurrent_queues/sync_queue.hpp>
 #include <boost/thread/executors/work.hpp>
 
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-
 #include <boost/config/abi_prefix.hpp>
 
 namespace boost
@@ -33,170 +30,59 @@ namespace executors
     /// type-erasure to store the works to do
     typedef  executors::work work;
   private:
+    /// the thread safe work queue
+    concurrent::sync_queue<work > work_queue;
 
-    struct shared_state {
-      typedef  executors::work work;
-      /// the thread safe work queue
-      concurrent::sync_queue<work > work_queue;
-
-      /**
-       * Effects: try to execute one task.
-       * Returns: whether a task has been executed.
-       * Throws: whatever the current task constructor throws or the task() throws.
-       */
-      bool try_executing_one()
-      {
-        work task;
-        try
-        {
-          if (work_queue.try_pull(task) == queue_op_status::success)
-          {
-            task();
-            return true;
-          }
-          return false;
-        }
-        catch (...)
-        {
-          std::terminate();
-          return false;
-        }
-      }
-      /**
-       * Effects: schedule one task or yields
-       * Throws: whatever the current task constructor throws or the task() throws.
-       */
-      void schedule_one_or_yield()
-      {
-          if ( ! try_executing_one())
-          {
-            this_thread::yield();
-          }
-      }
-
-      /// loop_executor is not copyable.
-      BOOST_THREAD_NO_COPYABLE(shared_state)
-
-      /**
-       * \b Effects: creates a thread pool that runs closures using one of its closure-executing methods.
-       *
-       * \b Throws: Whatever exception is thrown while initializing the needed resources.
-       */
-      shared_state()
-      {
-      }
-      /**
-       * \b Effects: Destroys the thread pool.
-       *
-       * \b Synchronization: The completion of all the closures happen before the completion of the \c loop_executor destructor.
-       */
-      ~shared_state()
-      {
-        // signal to all the worker thread that there will be no more submissions.
-        close();
-      }
-
-      /**
-       * The main loop of the worker thread
-       */
-      void loop()
-      {
-        while (!closed())
-        {
-          schedule_one_or_yield();
-        }
-        while (try_executing_one())
-        {
-        }
-      }
-
-      /**
-       * \b Effects: close the \c loop_executor for submissions.
-       * The loop will work until there is no more closures to run.
-       */
-      void close()
-      {
-        work_queue.close();
-      }
-
-      /**
-       * \b Returns: whether the pool is closed for submissions.
-       */
-      bool closed()
-      {
-        return work_queue.closed();
-      }
-
-      /**
-       * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-       *
-       * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-       * If invoked closure throws an exception the \c loop_executor will call \c std::terminate, as is the case with threads.
-       *
-       * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-       *
-       * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
-       * Whatever exception that can be throw while storing the closure.
-       */
-
-  #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      template <typename Closure>
-      void submit(Closure & closure)
-      {
-        work_queue.push(work(closure));
-      }
-  #endif
-      void submit(void (*closure)())
-      {
-        work_queue.push(work(closure));
-      }
-
-      template <typename Closure>
-      void submit(BOOST_THREAD_RV_REF(Closure) closure)
-      {
-        work_queue.push(work(boost::forward<Closure>(closure)));
-      }
-
-      /**
-       * \b Requires: This must be called from an scheduled task.
-       *
-       * \b Effects: reschedule functions until pred()
-       */
-      template <typename Pred>
-      bool reschedule_until(Pred const& pred)
-      {
-        do {
-          if ( ! try_executing_one())
-          {
-            return false;
-          }
-        } while (! pred());
-        return true;
-      }
-
-      /**
-       * run queued closures
-       */
-      void run_queued_closures()
-      {
-        sync_queue<work>::underlying_queue_type q = work_queue.underlying_queue();
-        while (! q.empty())
-        {
-          work& task = q.front();
-          task();
-          q.pop_front();
-        }
-      }
-
-    };
   public:
+    /**
+     * Effects: try to execute one task.
+     * Returns: whether a task has been executed.
+     * Throws: whatever the current task constructor throws or the task() throws.
+     */
+    bool try_executing_one()
+    {
+      work task;
+      try
+      {
+        if (work_queue.try_pull(task) == queue_op_status::success)
+        {
+          task();
+          return true;
+        }
+        return false;
+      }
+      catch (...)
+      {
+        std::terminate();
+        return false;
+      }
+    }
+  private:
+    /**
+     * Effects: schedule one task or yields
+     * Throws: whatever the current task constructor throws or the task() throws.
+     */
+    void schedule_one_or_yield()
+    {
+        if ( ! try_executing_one())
+        {
+          this_thread::yield();
+        }
+    }
+
+
+
+
+  public:
+    /// loop_executor is not copyable.
+    BOOST_THREAD_NO_COPYABLE(loop_executor)
+
     /**
      * \b Effects: creates a thread pool that runs closures using one of its closure-executing methods.
      *
      * \b Throws: Whatever exception is thrown while initializing the needed resources.
      */
     loop_executor()
-    : pimpl(make_shared<shared_state>())
     {
     }
     /**
@@ -206,33 +92,22 @@ namespace executors
      */
     ~loop_executor()
     {
+      // signal to all the worker thread that there will be no more submissions.
+      close();
     }
 
-    /**
-     * Effects: try to execute one task.
-     * Returns: whether a task has been executed.
-     * Throws: whatever the current task constructor throws or the task() throws.
-     */
-    bool try_executing_one()
-    {
-      return pimpl->try_executing_one();
-    }
-//    /**
-//     * Effects: schedule one task or yields
-//     * Throws: whatever the current task constructor throws or the task() throws.
-//     */
-//    void schedule_one_or_yield()
-//    {
-//      return pimpl->schedule_one_or_yield();
-//    }
-
-
     /**
      * The main loop of the worker thread
      */
     void loop()
     {
-      pimpl->loop();
+      while (!closed())
+      {
+        schedule_one_or_yield();
+      }
+      while (try_executing_one())
+      {
+      }
     }
 
     /**
@@ -241,7 +116,7 @@ namespace executors
      */
     void close()
     {
-      pimpl->close();
+      work_queue.close();
     }
 
     /**
@@ -249,7 +124,7 @@ namespace executors
      */
     bool closed()
     {
-      return pimpl->closed();
+      return work_queue.closed();
     }
 
     /**
@@ -268,18 +143,18 @@ namespace executors
     template <typename Closure>
     void submit(Closure & closure)
     {
-      pimpl->submit(closure);
+      work_queue.push(work(closure));
     }
 #endif
     void submit(void (*closure)())
     {
-      pimpl->submit(closure);
+      work_queue.push(work(closure));
     }
 
     template <typename Closure>
     void submit(BOOST_THREAD_RV_REF(Closure) closure)
     {
-      pimpl->submit(boost::forward<Closure>(closure));
+      work_queue.push(work(boost::forward<Closure>(closure)));
     }
 
     /**
@@ -290,7 +165,13 @@ namespace executors
     template <typename Pred>
     bool reschedule_until(Pred const& pred)
     {
-      return pimpl->reschedule_until(pred);
+      do {
+        if ( ! try_executing_one())
+        {
+          return false;
+        }
+      } while (! pred());
+      return true;
     }
 
     /**
@@ -298,10 +179,15 @@ namespace executors
      */
     void run_queued_closures()
     {
-      pimpl->run_queued_closures();
+      sync_queue<work>::underlying_queue_type q = work_queue.underlying_queue();
+      while (! q.empty())
+      {
+        work& task = q.front();
+        task();
+        q.pop_front();
+      }
     }
-  private:
-    shared_ptr<shared_state> pimpl;
+
   };
 }
 using executors::loop_executor;

include/boost/thread/executors/scheduled_thread_pool.hpp

@@ -9,123 +9,36 @@
 #define BOOST_THREAD_EXECUTORS_SCHEDULED_THREAD_POOL_HPP
 
 #include <boost/thread/executors/detail/scheduled_executor_base.hpp>
-#include <boost/thread/executors/work.hpp>
-#include <boost/thread/detail/move.hpp>
-#include <boost/thread/scoped_thread.hpp>
-#include <boost/thread/csbl/vector.hpp>
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
 namespace boost
 {
 namespace executors
 {
 
-  template <class Clock = chrono::steady_clock>
-  class scheduled_thread_pool
+  class scheduled_thread_pool : public detail::scheduled_executor_base<>
   {
   private:
-
-    struct shared_state : public detail::scheduled_executor_base<> {
-
-      /// basic_thread_pool is not copyable.
-      BOOST_THREAD_NO_COPYABLE(shared_state)
-
-      typedef detail::scheduled_executor_base<> super;
-      typedef typename super::work work;
-
-      typedef scoped_thread<> thread_t;
-      typedef csbl::vector<thread_t> thread_vector;
-      thread_vector threads;
-
-      shared_state(unsigned const thread_count = thread::hardware_concurrency()+1) : super()
-      {
-
-        try
-        {
-          threads.reserve(thread_count);
-          for (unsigned i = 0; i < thread_count; ++i)
-          {
-  #if 1
-            thread th (&shared_state::loop, this);
-            threads.push_back(thread_t(boost::move(th)));
-  #else
-            threads.push_back(thread_t(&shared_state::loop, this)); // do not compile
-  #endif
-          }
-        }
-        catch (...)
-        {
-          close();
-          throw;
-        }
-      }
-
-      /**
-       * \b Effects: Destroys the thread pool.
-       *
-       * \b Synchronization: The completion of all the closures happen before the completion of the \c basic_thread_pool destructor.
-       */
-      ~shared_state()
-      {
-        this->close();
-      }
-    }; //end class
-
+    thread_group _workers;
   public:
-    typedef typename shared_state::work work;
-    typedef Clock clock;
-    typedef typename clock::duration duration;
-    typedef typename clock::time_point time_point;
 
-
-    /**
-     * \b Effects: creates a thread pool that runs closures on \c thread_count threads.
-     *
-     * \b Throws: Whatever exception is thrown while initializing the needed resources.
-     */
-    scheduled_thread_pool(unsigned const thread_count = thread::hardware_concurrency()+1)
-    : pimpl(make_shared<shared_state>(thread_count))
+    scheduled_thread_pool(size_t num_threads) : super()
     {
+      for(size_t i = 0; i < num_threads; i++)
+      {
+        _workers.create_thread(bind(&super::loop, this));
+      }
     }
 
-    /**
-     * \b Effects: Destroys the thread pool.
-     *
-     * \b Synchronization: The completion of all the closures happen before the completion of the \c basic_thread_pool destructor.
-     */
     ~scheduled_thread_pool()
     {
-    }
-    /**
-     * \b Effects: close the \c serial_executor for submissions.
-     * The loop will work until there is no more closures to run.
-     */
-    void close()
-    {
-      pimpl->close();
+      this->close();
+      _workers.join_all();
     }
 
-    /**
-     * \b Returns: whether the pool is closed for submissions.
-     */
-    bool closed()
-    {
-      return pimpl->closed();
-    }
-
-    void submit_at(work w, const time_point& tp)
-    {
-      return pimpl->submit_at(boost::move(w), tp);
-    }
-
-    void submit_after(work w, const duration& d)
-    {
-      return pimpl->submit_after(boost::move(w), d);
-    }
   private:
-    shared_ptr<shared_state> pimpl;
-  };
+    typedef detail::scheduled_executor_base<> super;
+  }; //end class
+
 } //end executors namespace
 
 using executors::scheduled_thread_pool;

include/boost/thread/executors/scheduler.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Vicente J. Botet Escriba
+// Copyright (C) 2014 Vicente J. Botet Escriba
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -13,8 +13,6 @@
 #include <boost/chrono/time_point.hpp>
 #include <boost/chrono/duration.hpp>
 #include <boost/chrono/system_clocks.hpp>
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
 #include <boost/config/abi_prefix.hpp>
 
@@ -38,7 +36,7 @@ namespace boost
       }
 
     private:
-      Executor   ex;
+      Executor&   ex;
       Function funct;
     };
 
@@ -102,8 +100,8 @@ namespace boost
       }
 
     private:
-      Scheduler   sch;
-      Executor   ex;
+      Scheduler&  sch;
+      Executor&   ex;
       typename clock::time_point  tp;
       bool  is_closed;
     };
@@ -152,8 +150,8 @@ namespace boost
       }
 
     private:
-      Scheduler sch;
-      Executor ex;
+      Scheduler& sch;
+      Executor& ex;
     }; //end class
 
     /// Wraps a reference to a @c Scheduler providing an @c Executor that
@@ -210,7 +208,7 @@ namespace boost
       }
 
     private:
-      Scheduler sch;
+      Scheduler& sch;
       time_point  tp;
       bool  is_closed;
     }; //end class
@@ -219,71 +217,22 @@ namespace boost
     /// It provides factory helper functions such as at/after that convert a @c Scheduler into an @c Executor
     /// that submit the work at/after a specific time/duration respectively.
     template <class Clock = chrono::steady_clock>
-    class scheduler
+    class scheduler : public detail::scheduled_executor_base<Clock>
     {
-    private:
-
-      struct shared_state : public detail::scheduled_executor_base<Clock> {
-        typedef detail::scheduled_executor_base<Clock> super;
-        typedef typename super::work work;
-        thread thr;
-
-        /// shared_state is not copyable.
-        BOOST_THREAD_NO_COPYABLE(shared_state)
-
-        shared_state()
-          : super(),
-            thr(&super::loop, this) {}
-
-        ~shared_state()
-        {
-          this->close();
-          thr.join();
-        }
-
-      };
-
     public:
-      typedef typename shared_state::work work;
+      typedef typename detail::scheduled_executor_base<Clock>::work work;
+
       typedef Clock clock;
-      typedef typename clock::duration duration;
-      typedef typename clock::time_point time_point;
 
       scheduler()
-        : pimpl(make_shared<shared_state>())
-      {}
+        : super(),
+          thr(&super::loop, this) {}
 
       ~scheduler()
       {
+        this->close();
+        thr.join();
       }
-
-      /**
-       * \b Effects: close the \c serial_executor for submissions.
-       * The loop will work until there is no more closures to run.
-       */
-      void close()
-      {
-        pimpl->close();
-      }
-
-      /**
-       * \b Returns: whether the pool is closed for submissions.
-       */
-      bool closed()
-      {
-        return pimpl->closed();
-      }
-
-      void submit_at(work w, const time_point& tp)
-      {
-        return pimpl->submit_at(boost::move(w), tp);
-      }
-
-      void submit_after(work w, const duration& d)
-      {
-        return pimpl->submit_after(boost::move(w), d);
-      }
-
       template <class Ex>
       scheduler_executor_wrapper<scheduler, Ex> on(Ex& ex)
       {
@@ -301,10 +250,13 @@ namespace boost
       {
         return at_executor<scheduler>(*this, tp);
       }
+
     private:
-      shared_ptr<shared_state> pimpl;
+      typedef detail::scheduled_executor_base<Clock> super;
+      thread thr;
     };
 
+
   }
   using executors::resubmitter;
   using executors::resubmit;

include/boost/thread/executors/scheduling_adaptor.hpp

@@ -19,7 +19,7 @@ namespace executors
   class scheduling_adpator : public detail::scheduled_executor_base<>
   {
   private:
-    Executor _exec;
+    Executor& _exec;
     thread _scheduler;
   public:
 

include/boost/thread/executors/serial_executor.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2013,2015 Vicente J. Botet Escriba
+// Copyright (C) 2013 Vicente J. Botet Escriba
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,168 +14,116 @@
 #include <boost/thread/detail/move.hpp>
 #include <boost/thread/concurrent_queues/sync_queue.hpp>
 #include <boost/thread/executors/work.hpp>
-#include <boost/thread/executors/generic_executor.hpp>
+#include <boost/thread/executors/generic_executor_ref.hpp>
 #include <boost/thread/future.hpp>
 #include <boost/thread/scoped_thread.hpp>
 
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-
 #include <boost/config/abi_prefix.hpp>
 
 namespace boost
 {
 namespace executors
 {
-  template <class Executor>
   class serial_executor
   {
   public:
     /// type-erasure to store the works to do
     typedef  executors::work work;
   private:
+    typedef  scoped_thread<> thread_t;
 
-    struct shared_state {
-      typedef  executors::work work;
-      typedef  scoped_thread<> thread_t;
+    /// the thread safe work queue
+    concurrent::sync_queue<work > work_queue;
+    generic_executor_ref ex;
+    thread_t thr;
 
-      /// the thread safe work queue
-      concurrent::sync_queue<work > work_queue;
-      Executor ex;
-      thread_t thr;
-
-      struct try_executing_one_task {
-        work& task;
-        boost::promise<void> &p;
-        try_executing_one_task(work& task, boost::promise<void> &p)
-        : task(task), p(p) {}
-        void operator()() {
-          try {
-            task();
-            p.set_value();
-          } catch (...)
-          {
-            p.set_exception(current_exception());
-          }
-        }
-      };
-    public:
-      /**
-       * \par Returns
-       * The underlying executor wrapped on a generic executor reference.
-       */
-      Executor& underlying_executor() BOOST_NOEXCEPT { return ex; }
-
-    private:
-
-      /**
-       * The main loop of the worker thread
-       */
-      void worker_thread()
-      {
-        try
+    struct try_executing_one_task {
+      work& task;
+      boost::promise<void> &p;
+      try_executing_one_task(work& task, boost::promise<void> &p)
+      : task(task), p(p) {}
+      void operator()() {
+        try {
+          task();
+          p.set_value();
+        } catch (...)
         {
-          for(;;)
-          {
-            work task;
-            queue_op_status st = work_queue.wait_pull(task);
-            if (st == queue_op_status::closed) return;
-
-            boost::promise<void> p;
-            try_executing_one_task tmp(task,p);
-            ex.submit(tmp);
-            p.get_future().wait();
-          }
-        }
-        catch (...)
-        {
-          std::terminate();
-          return;
+          p.set_exception(current_exception());
         }
       }
-
-    public:
-      /// shared_state is not copyable.
-      BOOST_THREAD_NO_COPYABLE(shared_state)
-
-      /**
-       * \b Effects: creates a thread pool that runs closures using one of its closure-executing methods.
-       *
-       * \b Throws: Whatever exception is thrown while initializing the needed resources.
-       */
-      shared_state(Executor& ex)
-      : ex(ex), thr(&shared_state::worker_thread, this)
-      {
-      }
-      /**
-       * \b Effects: Destroys the thread pool.
-       *
-       * \b Synchronization: The completion of all the closures happen before the completion of the \c shared_state destructor.
-       */
-      ~shared_state()
-      {
-        // signal to the worker thread that there will be no more submissions.
-        close();
-      }
-
-      /**
-       * \b Effects: close the \c serial_executor for submissions.
-       * The loop will work until there is no more closures to run.
-       */
-      void close()
-      {
-        work_queue.close();
-      }
-
-      /**
-       * \b Returns: whether the pool is closed for submissions.
-       */
-      bool closed()
-      {
-        return work_queue.closed();
-      }
-
-      /**
-       * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-       *
-       * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-       * If invoked closure throws an exception the \c serial_executor will call \c std::terminate, as is the case with threads.
-       *
-       * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-       *
-       * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
-       * Whatever exception that can be throw while storing the closure.
-       */
-
-  #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      template <typename Closure>
-      void submit(Closure & closure)
-      {
-        work_queue.push(work(closure));
-      }
-  #endif
-      void submit(void (*closure)())
-      {
-        work_queue.push(work(closure));
-      }
-
-      template <typename Closure>
-      void submit(BOOST_THREAD_RV_REF(Closure) closure)
-      {
-        work_queue.push(work(boost::forward<Closure>(closure)));
-      }
-
     };
+  public:
+    /**
+     * \par Returns
+     * The underlying executor wrapped on a generic executor reference.
+     */
+    generic_executor_ref& underlying_executor() BOOST_NOEXCEPT { return ex; }
+
+    /**
+     * Effects: try to execute one task.
+     * Returns: whether a task has been executed.
+     * Throws: whatever the current task constructor throws or the task() throws.
+     */
+    bool try_executing_one()
+    {
+      work task;
+      try
+      {
+        if (work_queue.try_pull(task) == queue_op_status::success)
+        {
+          boost::promise<void> p;
+          try_executing_one_task tmp(task,p);
+          ex.submit(tmp);
+          p.get_future().wait();
+          return true;
+        }
+        return false;
+      }
+      catch (...)
+      {
+        std::terminate();
+        return false;
+      }
+    }
+  private:
+    /**
+     * Effects: schedule one task or yields
+     * Throws: whatever the current task constructor throws or the task() throws.
+     */
+    void schedule_one_or_yield()
+    {
+        if ( ! try_executing_one())
+        {
+          this_thread::yield();
+        }
+    }
+
+    /**
+     * The main loop of the worker thread
+     */
+    void worker_thread()
+    {
+      while (!closed())
+      {
+        schedule_one_or_yield();
+      }
+      while (try_executing_one())
+      {
+      }
+    }
 
   public:
+    /// serial_executor is not copyable.
+    BOOST_THREAD_NO_COPYABLE(serial_executor)
 
     /**
      * \b Effects: creates a thread pool that runs closures using one of its closure-executing methods.
      *
      * \b Throws: Whatever exception is thrown while initializing the needed resources.
      */
+    template <class Executor>
     serial_executor(Executor& ex)
-    : pimpl(make_shared<shared_state>(ex))
+    : ex(ex), thr(&serial_executor::worker_thread, this)
     {
     }
     /**
@@ -185,24 +133,8 @@ namespace executors
      */
     ~serial_executor()
     {
-    }
-
-    /**
-     * \par Returns
-     * The underlying executor wrapped on a generic executor reference.
-     */
-    Executor& underlying_executor() BOOST_NOEXCEPT
-    {
-      return pimpl->underlying_executor();
-    }
-
-    /**
-     * \b Returns: always false as a serial executor can not re-enter.
-     * Remark: A serial executor can not execute one of its pending tasks as the tasks depends on the other tasks.
-     */
-    bool try_executing_one()
-    {
-      return false;
+      // signal to the worker thread that there will be no more submissions.
+      close();
     }
 
     /**
@@ -211,7 +143,7 @@ namespace executors
      */
     void close()
     {
-      pimpl->close();
+      work_queue.close();
     }
 
     /**
@@ -219,7 +151,7 @@ namespace executors
      */
     bool closed()
     {
-      return pimpl->closed();
+      return work_queue.closed();
     }
 
     /**
@@ -238,31 +170,37 @@ namespace executors
     template <typename Closure>
     void submit(Closure & closure)
     {
-      pimpl->submit(closure);
+      work_queue.push(work(closure));
     }
 #endif
     void submit(void (*closure)())
     {
-      pimpl->submit(closure);
+      work_queue.push(work(closure));
     }
 
     template <typename Closure>
     void submit(BOOST_THREAD_RV_REF(Closure) closure)
     {
-      pimpl->submit(boost::forward<Closure>(closure));
+      work_queue.push(work(boost::forward<Closure>(closure)));
     }
 
     /**
-     * \b Returns: always false as a serial executor can not re-enter.
-     * Remark: A serial executor can not execute one of its pending tasks as the tasks depends on the other tasks.
+     * \b Requires: This must be called from an scheduled task.
+     *
+     * \b Effects: reschedule functions until pred()
      */
     template <typename Pred>
     bool reschedule_until(Pred const& pred)
     {
-      return false;
+      do {
+        if ( ! try_executing_one())
+        {
+          return false;
+        }
+      } while (! pred());
+      return true;
     }
-  private:
-    shared_ptr<shared_state> pimpl;
+
   };
 }
 using executors::serial_executor;

include/boost/thread/executors/serial_executor_cont.hpp

@@ -12,20 +12,18 @@
 #include <boost/thread/detail/config.hpp>
 #include <boost/thread/detail/delete.hpp>
 #include <boost/thread/detail/move.hpp>
+#include <boost/thread/concurrent_queues/sync_queue.hpp>
 #include <boost/thread/executors/work.hpp>
+#include <boost/thread/executors/generic_executor_ref.hpp>
 #include <boost/thread/future.hpp>
 #include <boost/thread/scoped_thread.hpp>
 
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-
 #include <boost/config/abi_prefix.hpp>
 
 namespace boost
 {
 namespace executors
 {
-  template <class Executor>
   class serial_executor_cont
   {
   public:
@@ -33,156 +31,93 @@ namespace executors
     typedef  executors::work work;
   private:
 
-    struct shared_state {
-      typedef  executors::work work;
+    generic_executor_ref ex_;
+    future<void> fut_; // protected by mtx_
+    bool closed_; // protected by mtx_
+    mutex mtx_;
 
-      Executor ex_;
-      future<void> fut_; // protected by mtx_
-      bool closed_; // protected by mtx_
-      mutex mtx_;
-
-      struct continuation {
-        work task;
-        template <class X>
-        struct result {
-          typedef void type;
-        };
-        continuation(BOOST_THREAD_RV_REF(work) tsk)
-        : task(boost::move(tsk)) {}
-        void operator()(future<void> f)
-        {
-          try {
-            task();
-          } catch (...)  {
-            std::terminate();
-          }
-        }
+    struct continuation {
+      work task;
+      template <class X>
+      struct result {
+        typedef void type;
       };
-
-      bool closed(lock_guard<mutex>&) const
+      continuation(BOOST_THREAD_RV_REF(work) tsk)
+      : task(boost::move(tsk)) {}
+      void operator()(future<void> f)
       {
-        return closed_;
-      }
-    public:
-      /**
-       * \par Returns
-       * The underlying executor wrapped on a generic executor reference.
-       */
-      Executor& underlying_executor() BOOST_NOEXCEPT { return ex_; }
-
-      /// shared_state is not copyable.
-      BOOST_THREAD_NO_COPYABLE(shared_state)
-
-      /**
-       * \b Effects: creates a serial executor that runs closures in fifo order using one the associated executor.
-       *
-       * \b Throws: Whatever exception is thrown while initializing the needed resources.
-       *
-       * \b Notes:
-       * * The lifetime of the associated executor must outlive the serial executor.
-       * * The current implementation doesn't support submission from synchronous continuation, that is,
-       *     - the executor must execute the continuation asynchronously or
-       *     - the continuation can not submit to this serial executor.
-       */
-      shared_state(Executor& ex)
-      : ex_(ex), fut_(make_ready_future()), closed_(false)
-      {
-      }
-      /**
-       * \b Effects: Destroys the thread pool.
-       *
-       * \b Synchronization: The completion of all the closures happen before the completion of the \c serial_executor_cont destructor.
-       */
-      ~shared_state()
-      {
-        // signal to the worker thread that there will be no more submissions.
-        close();
-      }
-
-      /**
-       * \b Effects: close the \c serial_executor_cont for submissions.
-       * The loop will work until there is no more closures to run.
-       */
-      void close()
-      {
-        lock_guard<mutex> lk(mtx_);
-        closed_ = true;;
-      }
-
-      /**
-       * \b Returns: whether the pool is closed for submissions.
-       */
-      bool closed()
-      {
-        lock_guard<mutex> lk(mtx_);
-        return closed(lk);
-      }
-
-      /**
-       * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-       *
-       * \b Effects: The specified \c closure will be scheduled for execution after the last submitted closure finish.
-       * If the invoked closure throws an exception the \c serial_executor_cont will call \c std::terminate, as is the case with threads.
-       *
-       * \b Throws: \c sync_queue_is_closed if the executor is closed.
-       * Whatever exception that can be throw while storing the closure.
-       *
-       */
-
-  #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      template <typename Closure>
-      void submit(Closure & closure)
-      {
-        lock_guard<mutex> lk(mtx_);
-        if (closed(lk))       BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-        fut_ = fut_.then(ex_, continuation(work(closure)));
-      }
-  #endif
-      void submit(void (*closure)())
-      {
-        lock_guard<mutex> lk(mtx_);
-        if (closed(lk))       BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-        fut_ = fut_.then(ex_, continuation(work(closure)));
-      }
-
-      template <typename Closure>
-      void submit(BOOST_THREAD_RV_REF(Closure) closure)
-      {
-        lock_guard<mutex> lk(mtx_);
-        if (closed(lk))       BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-        fut_ = fut_.then(ex_, continuation(work(boost::forward<Closure>(closure))));
+        try {
+          task();
+        } catch (...)  {
+          std::terminate();
+        }
       }
     };
+
+    bool closed(lock_guard<mutex>&) const
+    {
+      return closed_;
+    }
   public:
     /**
-     * \b Effects: creates a thread pool that runs closures using one of its closure-executing methods.
+     * \par Returns
+     * The underlying executor wrapped on a generic executor reference.
+     */
+    generic_executor_ref& underlying_executor() BOOST_NOEXCEPT { return ex_; }
+
+    /// serial_executor_cont is not copyable.
+    BOOST_THREAD_NO_COPYABLE(serial_executor_cont)
+
+    /**
+     * \b Effects: creates a serial executor that runs closures in fifo order using one the associated executor.
      *
      * \b Throws: Whatever exception is thrown while initializing the needed resources.
+     *
+     * \b Notes:
+     * * The lifetime of the associated executor must outlive the serial executor.
+     * * The current implementation doesn't support submission from synchronous continuation, that is,
+     *     - the executor must execute the continuation asynchronously or
+     *     - the continuation can not submit to this serial executor.
      */
+    template <class Executor>
     serial_executor_cont(Executor& ex)
-    : pimpl(make_shared<shared_state>(ex))
+    : ex_(ex), fut_(make_ready_future()), closed_(false)
     {
     }
     /**
      * \b Effects: Destroys the thread pool.
      *
-     * \b Synchronization: The completion of all the closures happen before the completion of the \c serial_executor destructor.
+     * \b Synchronization: The completion of all the closures happen before the completion of the \c serial_executor_cont destructor.
      */
     ~serial_executor_cont()
     {
+      // signal to the worker thread that there will be no more submissions.
+      close();
     }
 
     /**
-     * \par Returns
-     * The underlying executor wrapped on a generic executor reference.
+     * \b Effects: close the \c serial_executor_cont for submissions.
+     * The loop will work until there is no more closures to run.
      */
-    Executor& underlying_executor() BOOST_NOEXCEPT
+    void close()
     {
-      return pimpl->underlying_executor();
+      lock_guard<mutex> lk(mtx_);
+      closed_ = true;;
     }
 
     /**
-     * \b Returns: always false as a serial executor can not re-enter.
+     * \b Returns: whether the pool is closed for submissions.
+     */
+    bool closed()
+    {
+      lock_guard<mutex> lk(mtx_);
+      return closed(lk);
+    }
+
+    /**
+     * Effects: none.
+     * Returns: always false.
+     * Throws: No.
      * Remark: A serial executor can not execute one of its pending tasks as the tasks depends on the other tasks.
      */
     bool try_executing_one()
@@ -190,64 +125,41 @@ namespace executors
       return false;
     }
 
-    /**
-     * \b Effects: close the \c serial_executor for submissions.
-     * The loop will work until there is no more closures to run.
-     */
-    void close()
-    {
-      pimpl->close();
-    }
-
-    /**
-     * \b Returns: whether the pool is closed for submissions.
-     */
-    bool closed()
-    {
-      return pimpl->closed();
-    }
-
     /**
      * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
      *
-     * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-     * If invoked closure throws an exception the \c serial_executor will call \c std::terminate, as is the case with threads.
+     * \b Effects: The specified \c closure will be scheduled for execution after the last submitted closure finish.
+     * If the invoked closure throws an exception the \c serial_executor_cont will call \c std::terminate, as is the case with threads.
      *
-     * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-     *
-     * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
+     * \b Throws: \c sync_queue_is_closed if the executor is closed.
      * Whatever exception that can be throw while storing the closure.
+     *
      */
 
 #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     template <typename Closure>
     void submit(Closure & closure)
     {
-      pimpl->submit(closure);
+      lock_guard<mutex> lk(mtx_);
+      if (closed(lk))       BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
+      fut_ = fut_.then(ex_, continuation(work(closure)));
     }
 #endif
     void submit(void (*closure)())
     {
-      pimpl->submit(closure);
+      lock_guard<mutex> lk(mtx_);
+      if (closed(lk))       BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
+      fut_ = fut_.then(ex_, continuation(work(closure)));
     }
 
     template <typename Closure>
     void submit(BOOST_THREAD_RV_REF(Closure) closure)
     {
-      pimpl->submit(boost::forward<Closure>(closure));
+      lock_guard<mutex> lk(mtx_);
+      if (closed(lk))       BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
+      fut_ = fut_.then(ex_, continuation(work(boost::forward<Closure>(closure))));
     }
 
-    /**
-     * \b Returns: always false as a serial executor can not re-enter.
-     * Remark: A serial executor can not execute one of its pending tasks as the tasks depends on the other tasks.
-     */
-    template <typename Pred>
-    bool reschedule_until(Pred const& pred)
-    {
-      return false;
-    }
-  private:
-    shared_ptr<shared_state> pimpl;
   };
 }
 using executors::serial_executor_cont;

include/boost/thread/executors/thread_executor.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Vicente J. Botet Escriba
+// Copyright (C) 2014 Vicente J. Botet Escriba
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,9 +18,6 @@
 #include <boost/thread/scoped_thread.hpp>
 #include <boost/thread/csbl/vector.hpp>
 
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-
 #include <boost/config/abi_prefix.hpp>
 
 namespace boost
@@ -32,134 +29,33 @@ namespace executors
   public:
     /// type-erasure to store the works to do
     typedef  executors::work work;
-  private:
+    bool closed_;
+    typedef scoped_thread<> thread_t;
+    typedef csbl::vector<thread_t> threads_type;
+    threads_type threads_;
+    mutable mutex mtx_;
 
-    struct shared_state {
-      typedef  executors::work work;
-      bool closed_;
-      typedef scoped_thread<> thread_t;
-      typedef csbl::vector<thread_t> threads_type;
-      threads_type threads_;
-      mutable mutex mtx_;
+    /**
+     * Effects: try to execute one task.
+     * Returns: whether a task has been executed.
+     * Throws: whatever the current task constructor throws or the task() throws.
+     */
+    bool try_executing_one()
+    {
+      return false;
+    }
 
-      /// thread_executor is not copyable.
-      BOOST_THREAD_NO_COPYABLE(shared_state)
-
-      /**
-       * \b Effects: creates a inline executor that runs closures immediately.
-       *
-       * \b Throws: Nothing.
-       */
-      shared_state()
-      : closed_(false)
-      {
-      }
-      /**
-       * \b Effects: Waits for closures (if any) to complete, then joins and destroys the threads.
-       *
-       * \b Synchronization: The completion of all the closures happen before the completion of the \c thread_executor destructor.
-       */
-      ~shared_state()
-      {
-        // signal to all the worker thread that there will be no more submissions.
-        close();
-        // all the scoped threads will join before destroying
-      }
-
-      /**
-       * Effects: try to execute one task.
-       * Returns: whether a task has been executed.
-       * Throws: whatever the current task constructor throws or the task() throws.
-       */
-      bool try_executing_one()
-      {
-        return false;
-      }
-
-      /**
-       * \b Effects: close the \c thread_executor for submissions.
-       * The loop will work until there is no more closures to run.
-       */
-      void close()
-      {
-        lock_guard<mutex> lk(mtx_);
-        closed_ = true;
-      }
-
-      /**
-       * \b Returns: whether the pool is closed for submissions.
-       */
-      bool closed(lock_guard<mutex>& )
-      {
-        return closed_;
-      }
-      bool closed()
-      {
-        lock_guard<mutex> lk(mtx_);
-        return closed(lk);
-      }
-
-      /**
-       * \b Requires: \c Closure is a model of \c Callable(void()) and a model of \c CopyConstructible/MoveConstructible.
-       *
-       * \b Effects: The specified \c closure will be scheduled for execution at some point in the future.
-       * If invoked closure throws an exception the \c thread_executor will call \c std::terminate, as is the case with threads.
-       *
-       * \b Synchronization: completion of \c closure on a particular thread happens before destruction of thread's thread local variables.
-       *
-       * \b Throws: \c sync_queue_is_closed if the thread pool is closed.
-       * Whatever exception that can be throw while storing the closure.
-       */
-
-  #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      template <typename Closure>
-      void submit(Closure & closure)
-      {
-        lock_guard<mutex> lk(mtx_);
-        if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-        threads_.reserve(threads_.size() + 1);
-        thread th(closure);
-        threads_.push_back(thread_t(boost::move(th)));
-      }
-  #endif
-      void submit(void (*closure)())
-      {
-        lock_guard<mutex> lk(mtx_);
-        if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-        threads_.reserve(threads_.size() + 1);
-        thread th(closure);
-        threads_.push_back(thread_t(boost::move(th)));
-      }
-
-      template <typename Closure>
-      void submit(BOOST_THREAD_FWD_REF(Closure) closure)
-      {
-        lock_guard<mutex> lk(mtx_);
-        if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
-        threads_.reserve(threads_.size() + 1);
-        thread th(boost::forward<Closure>(closure));
-        threads_.push_back(thread_t(boost::move(th)));
-      }
-
-      /**
-       * \b Requires: This must be called from an scheduled task.
-       *
-       * \b Effects: reschedule functions until pred()
-       */
-      template <typename Pred>
-      bool reschedule_until(Pred const&)
-      {
-        return false;
-      }
-    };
   public:
+    /// thread_executor is not copyable.
+    BOOST_THREAD_NO_COPYABLE(thread_executor)
+
     /**
      * \b Effects: creates a inline executor that runs closures immediately.
      *
      * \b Throws: Nothing.
      */
     thread_executor()
-    : pimpl(make_shared<shared_state>())
+    : closed_(false)
     {
     }
     /**
@@ -169,16 +65,9 @@ namespace executors
      */
     ~thread_executor()
     {
-    }
-
-    /**
-     * Effects: try to execute one task.
-     * Returns: whether a task has been executed.
-     * Throws: whatever the current task constructor throws or the task() throws.
-     */
-    bool try_executing_one()
-    {
-      return pimpl->try_executing_one();
+      // signal to all the worker thread that there will be no more submissions.
+      close();
+      // all the scoped threads will join before destroying
     }
 
     /**
@@ -187,15 +76,21 @@ namespace executors
      */
     void close()
     {
-      pimpl->close();
+      lock_guard<mutex> lk(mtx_);
+      closed_ = true;
     }
 
     /**
      * \b Returns: whether the pool is closed for submissions.
      */
+    bool closed(lock_guard<mutex>& )
+    {
+      return closed_;
+    }
     bool closed()
     {
-      return pimpl->closed();
+      lock_guard<mutex> lk(mtx_);
+      return closed(lk);
     }
 
     /**
@@ -214,18 +109,30 @@ namespace executors
     template <typename Closure>
     void submit(Closure & closure)
     {
-      pimpl->submit(closure);
+      lock_guard<mutex> lk(mtx_);
+      if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
+      threads_.reserve(threads_.size() + 1);
+      thread th(closure);
+      threads_.push_back(thread_t(boost::move(th)));
     }
 #endif
     void submit(void (*closure)())
     {
-      pimpl->submit(closure);
+      lock_guard<mutex> lk(mtx_);
+      if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
+      threads_.reserve(threads_.size() + 1);
+      thread th(closure);
+      threads_.push_back(thread_t(boost::move(th)));
     }
 
     template <typename Closure>
     void submit(BOOST_THREAD_FWD_REF(Closure) closure)
     {
-      pimpl->submit(boost::forward<Closure>(closure));
+      lock_guard<mutex> lk(mtx_);
+      if (closed(lk))  BOOST_THROW_EXCEPTION( sync_queue_is_closed() );
+      threads_.reserve(threads_.size() + 1);
+      thread th(boost::forward<Closure>(closure));
+      threads_.push_back(thread_t(boost::move(th)));
     }
 
     /**
@@ -234,14 +141,12 @@ namespace executors
      * \b Effects: reschedule functions until pred()
      */
     template <typename Pred>
-    bool reschedule_until(Pred const& p)
+    bool reschedule_until(Pred const&)
     {
-      return pimpl->reschedule_until(p);
+      return false;
     }
-  private:
-    shared_ptr<shared_state> pimpl;
-  };
 
+  };
 }
 using executors::thread_executor;
 }

include/boost/thread/experimental/parallel/v2/task_region.hpp

@@ -116,9 +116,9 @@ BOOST_THREAD_INLINE_NAMESPACE(v2)
     template<typename F>
     friend void task_region_final(BOOST_THREAD_FWD_REF(F) f);
     template <class Ex, typename F>
-    friend void task_region(Ex const&, BOOST_THREAD_FWD_REF(F) f);
+    friend void task_region(Ex&, BOOST_THREAD_FWD_REF(F) f);
     template<class Ex, typename F>
-    friend void task_region_final(Ex const&, BOOST_THREAD_FWD_REF(F) f);
+    friend void task_region_final(Ex&, BOOST_THREAD_FWD_REF(F) f);
 
     void wait_all()
     {
@@ -153,20 +153,21 @@ protected:
 #if defined BOOST_THREAD_TASK_REGION_HAS_SHARED_CANCELED && defined BOOST_THREAD_PROVIDES_EXECUTORS
     task_region_handle_gen()
     : canceled(false)
+    , ex(0)
     {}
-    task_region_handle_gen(Executor const& ex)
+    task_region_handle_gen(Executor& ex)
     : canceled(false)
-    , ex(ex)
+    , ex(&ex)
     {}
 
 #endif
 
 #if ! defined BOOST_THREAD_TASK_REGION_HAS_SHARED_CANCELED && defined BOOST_THREAD_PROVIDES_EXECUTORS
     task_region_handle_gen()
-    //: ex(0)
+    : ex(0)
     {}
-    task_region_handle_gen(Executor const& ex)
-    : ex(ex)
+    task_region_handle_gen(Executor& ex)
+    : ex(&ex)
     {}
 #endif
 
@@ -187,7 +188,7 @@ protected:
     bool canceled;
 #endif
 #if defined BOOST_THREAD_PROVIDES_EXECUTORS
-    Executor ex;
+    Executor* ex;
 #endif
     exception_list exs;
     typedef csbl::vector<future<void> > group_type;
@@ -210,13 +211,13 @@ protected:
         }
       }
 #if defined BOOST_THREAD_PROVIDES_EXECUTORS
-      group.push_back(async(ex, detail::wrapped<task_region_handle_gen<Executor>, F>(*this, forward<F>(f))));
+      group.push_back(async(*ex, detail::wrapped<task_region_handle_gen<Executor>, F>(*this, forward<F>(f))));
 #else
       group.push_back(async(detail::wrapped<task_region_handle_gen<Executor>, F>(*this, forward<F>(f))));
 #endif
 #else
 #if defined BOOST_THREAD_PROVIDES_EXECUTORS
-      group.push_back(async(ex, forward<F>(f)));
+      group.push_back(async(*ex, forward<F>(f)));
 #else
       group.push_back(async(forward<F>(f)));
 #endif
@@ -244,18 +245,17 @@ protected:
   class task_region_handle :
     public task_region_handle_gen<default_executor>
   {
-    //default_executor tp;
+    default_executor tp;
     template <typename F>
     friend void task_region(BOOST_THREAD_FWD_REF(F) f);
     template<typename F>
     friend void task_region_final(BOOST_THREAD_FWD_REF(F) f);
 
   protected:
-    task_region_handle()
-    : task_region_handle_gen<default_executor>()
+    task_region_handle() : task_region_handle_gen<default_executor>()
     {
 #if defined BOOST_THREAD_PROVIDES_EXECUTORS
-      //ex = &tp;
+      ex = &tp;
 #endif
     }
     BOOST_DELETED_FUNCTION(task_region_handle(const task_region_handle&))
@@ -265,7 +265,7 @@ protected:
   };
 
   template <typename Executor, typename F>
-  void task_region_final(Executor const& ex, BOOST_THREAD_FWD_REF(F) f)
+  void task_region_final(Executor& ex, BOOST_THREAD_FWD_REF(F) f)
   {
     task_region_handle_gen<Executor> tr(ex);
     try
@@ -280,7 +280,7 @@ protected:
   }
 
   template <typename Executor, typename F>
-  void task_region(Executor const& ex, BOOST_THREAD_FWD_REF(F) f)
+  void task_region(Executor& ex, BOOST_THREAD_FWD_REF(F) f)
   {
     task_region_final(ex, forward<F>(f));
   }

include/boost/thread/future.hpp

@@ -137,7 +137,7 @@ namespace boost
             continuations_type continuations;
 
             // This declaration should be only included conditionally, but is included to maintain the same layout.
-            virtual void launch_continuation()
+            virtual void launch_continuation(boost::unique_lock<boost::mutex>&, shared_ptr<shared_state_base>)
             {
             }
 
@@ -150,19 +150,6 @@ namespace boost
                 policy_(launch::none),
                 continuations()
             {}
-
-            shared_state_base(exceptional_ptr const& ex):
-                exception(ex.ptr_),
-                done(true),
-                is_valid_(true),
-                is_deferred_(false),
-                is_constructed(false),
-                cnt_(0),
-                policy_(launch::none),
-                continuations()
-            {}
-
-
             virtual ~shared_state_base()
             {
               BOOST_ASSERT(cnt_==0);
@@ -234,7 +221,8 @@ namespace boost
                   continuations.clear();
                   relocker rlk(lock);
                   for (continuations_type::iterator it = the_continuations.begin(); it != the_continuations.end(); ++it) {
-                    (*it)->launch_continuation();
+                    boost::unique_lock<boost::mutex> cont_lock((*it)->mutex);
+                    (*it)->launch_continuation(cont_lock, *it);
                   }
                 }
             }
@@ -419,7 +407,7 @@ namespace boost
                 return policy_;
             }
 
-            future_state::state get_state(boost::unique_lock<boost::mutex>&) const
+            future_state::state get_state(boost::unique_lock<boost::mutex>& lk) const
             {
                 if(!done)
                 {
@@ -495,10 +483,6 @@ namespace boost
             shared_state():
                 result()
             {}
-            shared_state(exceptional_ptr const& ex):
-              detail::shared_state_base(ex), result()
-            {}
-
 
             ~shared_state()
             {}
@@ -640,10 +624,6 @@ namespace boost
                 result(0)
             {}
 
-            shared_state(exceptional_ptr const& ex):
-              detail::shared_state_base(ex), result(0)
-            {}
-
             ~shared_state()
             {
             }
@@ -707,10 +687,6 @@ namespace boost
             shared_state()
             {}
 
-            shared_state(exceptional_ptr const& ex):
-              detail::shared_state_base(ex)
-            {}
-
             void mark_finished_with_result_internal(boost::unique_lock<boost::mutex>& lock)
             {
                 mark_finished_internal(lock);
@@ -1174,7 +1150,16 @@ namespace boost
 
         static //BOOST_CONSTEXPR
         future_ptr make_exceptional_future_ptr(exceptional_ptr const& ex) {
-          return future_ptr(new detail::shared_state<R>(ex));
+          promise<R> p;
+          p.set_exception(ex.ptr_);
+          return p.get_future().future_;
+        }
+
+        void set_exceptional_if_invalid() {
+          if (valid()) return;
+          promise<R> p;
+          p.set_exception(future_uninitialized());
+          future_ = p.get_future().future_;
         }
 
         future_ptr future_;
@@ -2882,7 +2867,7 @@ namespace boost
             private:
               task_shared_state(task_shared_state&);
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
-              typedef R (*CallableType)(ArgTypes ... );
+              typedef R (*CallableType)(BOOST_THREAD_RV_REF(ArgTypes) ... );
 #else
               typedef R (*CallableType)();
 #endif
@@ -3113,7 +3098,7 @@ namespace boost
         private:
           task_shared_state(task_shared_state&);
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
-            typedef void (*CallableType)(ArgTypes...);
+            typedef void (*CallableType)(BOOST_THREAD_RV_REF(ArgTypes)...);
 #else
             typedef void (*CallableType)();
 #endif
@@ -3436,7 +3421,7 @@ namespace boost
 
         // execution
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
-        void operator()(ArgTypes... args) {
+        void operator()(BOOST_THREAD_RV_REF(ArgTypes)... args) {
             if(!task) {
                 boost::throw_exception(task_moved());
             }
@@ -4107,6 +4092,12 @@ namespace detail {
   }
 #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>
   BOOST_THREAD_FUTURE<T> make_exceptional_future(exception_ptr ex) {
@@ -4128,9 +4119,16 @@ namespace detail {
     p.set_exception(boost::current_exception());
     return BOOST_THREAD_MAKE_RV_REF(p.get_future());
   }
+
   template <typename T>
-  BOOST_THREAD_FUTURE<T> make_ready_future(exception_ptr ex)  {
-    return make_exceptional_future<T>(ex);
+  BOOST_THREAD_FUTURE<T> make_exceptional_future_if_invalid(BOOST_THREAD_FWD_REF(BOOST_THREAD_FUTURE<T>) fut) {
+    fut.set_exceptional_if_invalid();
+    return boost::move(fut);
+  }
+  template <typename T>
+  shared_future<T> make_exceptional_future_if_invalid(shared_future<T> fut) {
+    fut.set_exceptional_if_invalid();
+    return fut;
   }
 
 #if 0
@@ -4189,9 +4187,8 @@ namespace detail
     }
 
 
-    void launch_continuation() {
-      boost::lock_guard<boost::mutex> lk(this->mutex);
-      this->thr_ = thread(&future_async_continuation_shared_state::run, this->shared_from_this());
+    void launch_continuation(boost::unique_lock<boost::mutex>&, shared_ptr<shared_state_base> that) {
+      this->thr_ = thread(&future_async_continuation_shared_state::run, that);
     }
 
     static void run(shared_ptr<boost::detail::shared_state_base> that_) {
@@ -4221,9 +4218,8 @@ namespace detail
       centinel(parent.future_) {
     }
 
-    void launch_continuation() {
-      boost::lock_guard<boost::mutex> lk(this->mutex);
-      this->thr_ = thread(&future_async_continuation_shared_state::run, this->shared_from_this());
+    void launch_continuation(boost::unique_lock<boost::mutex>&, shared_ptr<shared_state_base> that) {
+      this->thr_ = thread(&future_async_continuation_shared_state::run, that);
     }
 
     static void run(shared_ptr<boost::detail::shared_state_base> that_) {
@@ -4273,8 +4269,9 @@ namespace detail
       this->set_executor();
     }
 
-    void launch_continuation() {
-      run_it<future_executor_continuation_shared_state> fct(this->shared_from_this());
+    void launch_continuation(boost::unique_lock<boost::mutex>& lck, shared_ptr<shared_state_base> that ) {
+      relocker relock(lck);
+      run_it<future_executor_continuation_shared_state> fct(that);
       ex->submit(fct);
     }
 
@@ -4311,8 +4308,9 @@ namespace detail
       this->set_executor();
     }
 
-    void launch_continuation() {
-      run_it<future_executor_continuation_shared_state> fct(this->shared_from_this());
+    void launch_continuation(boost::unique_lock<boost::mutex>& lck, shared_ptr<shared_state_base> that ) {
+      relocker relock(lck);
+      run_it<future_executor_continuation_shared_state> fct(that);
       ex->submit(fct);
     }
 
@@ -4353,9 +4351,8 @@ namespace detail
       centinel(parent.future_)  {
     }
 
-    void launch_continuation() {
-      boost::lock_guard<boost::mutex> lk(this->mutex);
-      this->thr_ = thread(&shared_future_async_continuation_shared_state::run, this->shared_from_this());
+    void launch_continuation(boost::unique_lock<boost::mutex>&, shared_ptr<shared_state_base> that) {
+      this->thr_ = thread(&shared_future_async_continuation_shared_state::run, that);
     }
 
     static void run(shared_ptr<boost::detail::shared_state_base> that_) {
@@ -4384,9 +4381,8 @@ namespace detail
       centinel(parent.future_)  {
     }
 
-    void launch_continuation() {
-      boost::lock_guard<boost::mutex> lk(this->mutex);
-      this->thr_ = thread(&shared_future_async_continuation_shared_state::run, this->shared_from_this());
+    void launch_continuation(boost::unique_lock<boost::mutex>&, shared_ptr<shared_state_base> that) {
+      this->thr_ = thread(&shared_future_async_continuation_shared_state::run, that);
     }
 
     static void run(shared_ptr<boost::detail::shared_state_base> that_) {
@@ -4423,8 +4419,9 @@ namespace detail
       this->set_executor();
     }
 
-    void launch_continuation() {
-      run_it<shared_future_executor_continuation_shared_state> fct(this->shared_from_this());
+    void launch_continuation(boost::unique_lock<boost::mutex>& lck, shared_ptr<shared_state_base> that) {
+      relocker relock(lck);
+      run_it<shared_future_executor_continuation_shared_state> fct(that);
       ex->submit(fct);
     }
 
@@ -4460,8 +4457,9 @@ namespace detail
       centinel(parent.future_) {
     }
 
-    void launch_continuation() {
-      run_it<shared_future_executor_continuation_shared_state> fct(this->shared_from_this());
+    void launch_continuation(boost::unique_lock<boost::mutex>& lck, shared_ptr<shared_state_base> that) {
+      relocker relock(lck);
+      run_it<shared_future_executor_continuation_shared_state> fct(that);
       ex->submit(fct);
     }
 
@@ -4501,8 +4499,7 @@ namespace detail
       this->set_deferred();
     }
 
-    virtual void launch_continuation() {
-      boost::unique_lock<boost::mutex> lk(this->mutex);
+    virtual void launch_continuation(boost::unique_lock<boost::mutex>&lk, shared_ptr<shared_state_base> ) {
       if (this->is_deferred_) {
         this->is_deferred_=false;
         this->execute(lk);
@@ -4540,8 +4537,7 @@ namespace detail
 
     ~future_deferred_continuation_shared_state() {
     }
-    virtual void launch_continuation() {
-      boost::unique_lock<boost::mutex> lk(this->mutex);
+    virtual void launch_continuation(boost::unique_lock<boost::mutex>& lk, shared_ptr<shared_state_base> ) {
       if (this->is_deferred_) {
         this->is_deferred_=false;
         this->execute(lk);
@@ -4580,8 +4576,7 @@ namespace detail
       this->set_deferred();
     }
 
-    virtual void launch_continuation() {
-      boost::unique_lock<boost::mutex> lk(this->mutex);
+    virtual void launch_continuation(boost::unique_lock<boost::mutex>& lk, shared_ptr<shared_state_base> ) {
       if (this->is_deferred_) {
         this->is_deferred_=false;
         this->execute(lk);
@@ -4617,8 +4612,7 @@ namespace detail
       this->set_deferred();
     }
 
-    virtual void launch_continuation() {
-      boost::unique_lock<boost::mutex> lk(this->mutex);
+    virtual void launch_continuation(boost::unique_lock<boost::mutex>& lk, shared_ptr<shared_state_base> ) {
       if (this->is_deferred_) {
         this->is_deferred_=false;
         this->execute(lk);
@@ -4832,17 +4826,14 @@ namespace detail
 
     boost::unique_lock<boost::mutex> lock(this->future_->mutex);
     if (underlying_cast<int>(policy) & int(launch::async)) {
-      lock.unlock();
       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)) {
-      lock.unlock();
       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 {
-      lock.unlock();
       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)
               )));
@@ -4858,7 +4849,6 @@ namespace detail
     BOOST_THREAD_ASSERT_PRECONDITION(this->future_!=0, future_uninitialized());
 
     boost::unique_lock<boost::mutex> lock(this->future_->mutex);
-    lock.unlock();
     return BOOST_THREAD_MAKE_RV_REF((boost::detail::make_future_executor_continuation_shared_state<Ex, BOOST_THREAD_FUTURE<R>, future_type, F>(ex,
                   lock, boost::move(*this), boost::forward<F>(func)
               )));
@@ -4874,18 +4864,15 @@ namespace detail
 
     boost::unique_lock<boost::mutex> lock(this->future_->mutex);
     if (underlying_cast<int>(this->launch_policy(lock)) & int(launch::async)) {
-      lock.unlock();
       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);
-      lock.unlock();
       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 {
-      lock.unlock();
       return boost::detail::make_future_async_continuation_shared_state<BOOST_THREAD_FUTURE<R>, future_type, F>(
           lock, boost::move(*this), boost::forward<F>(func)
       );
@@ -5026,87 +5013,41 @@ namespace detail
   template<typename F, typename Rp>
   struct future_unwrap_shared_state: shared_state<Rp>
   {
-    F wrapped;
-    typename F::value_type unwrapped;
+    F parent;
   public:
     explicit future_unwrap_shared_state(BOOST_THREAD_RV_REF(F) f)
-    : wrapped(boost::move(f)) {
+    : parent(boost::move(f)) {}
+
+    typename F::value_type parent_value(boost::unique_lock<boost::mutex>& ) {
+        typename F::value_type r = parent.get();
+        r.set_exceptional_if_invalid();
+        return boost::move(r);
     }
 
-    void launch_continuation()
+    virtual void wait(boost::unique_lock<boost::mutex>& lk, bool ) { // todo see if rethrow must be used
+        parent_value(lk).wait();
+    }
+    virtual Rp get(boost::unique_lock<boost::mutex>& lk) {
+        return parent_value(lk).get();
+    }
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+    typedef shared_ptr<shared_state_base> continuation_ptr_type;
+
+    virtual void set_continuation_ptr(continuation_ptr_type continuation, boost::unique_lock<boost::mutex>& lock)
     {
-      boost::unique_lock<boost::mutex> lk(this->mutex);
-      if (! unwrapped.valid() )
-      {
-        if (wrapped.has_exception()) {
-          this->mark_exceptional_finish_internal(wrapped.get_exception_ptr(), lk);
-        } else {
-          unwrapped = wrapped.get();
-          if (unwrapped.valid())
-          {
-            lk.unlock();
-            boost::unique_lock<boost::mutex> lk2(unwrapped.future_->mutex);
-            unwrapped.future_->set_continuation_ptr(this->shared_from_this(), lk2);
-          } else {
-            this->mark_exceptional_finish_internal(boost::copy_exception(future_uninitialized()), lk);
-          }
-        }
-      } else {
-        if (unwrapped.has_exception()) {
-          this->mark_exceptional_finish_internal(unwrapped.get_exception_ptr(), lk);
-        } else {
-          this->mark_finished_with_result_internal(unwrapped.get(), lk);
-        }
-      }
+      boost::unique_lock<boost::mutex> lk(parent.future_->mutex);
+      parent.future_->set_continuation_ptr(continuation, lk);
     }
+#endif
   };
 
-  template<typename F>
-  struct future_unwrap_shared_state<F,void>: shared_state<void>
-  {
-    F wrapped;
-    typename F::value_type unwrapped;
-  public:
-    explicit future_unwrap_shared_state(BOOST_THREAD_RV_REF(F) f)
-    : wrapped(boost::move(f)) {
-    }
-
-    void launch_continuation()
-    {
-      boost::unique_lock<boost::mutex> lk(this->mutex);
-      if (! unwrapped.valid() )
-      {
-        if (wrapped.has_exception()) {
-          this->mark_exceptional_finish_internal(wrapped.get_exception_ptr(), lk);
-        } else {
-          unwrapped = wrapped.get();
-          if (unwrapped.valid())
-          {
-            lk.unlock();
-            boost::unique_lock<boost::mutex> lk2(unwrapped.future_->mutex);
-            unwrapped.future_->set_continuation_ptr(this->shared_from_this(), lk2);
-          } else {
-            this->mark_exceptional_finish_internal(boost::copy_exception(future_uninitialized()), lk);
-          }
-        }
-      } else {
-        if (unwrapped.has_exception()) {
-          this->mark_exceptional_finish_internal(unwrapped.get_exception_ptr(), lk);
-        } else {
-          this->mark_finished_with_result_internal(lk);
-        }
-      }
-    }
-  };
-
-
   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)));
     lock.lock();
-    h->wrapped.future_->set_continuation_ptr(h, lock);
+    h->parent.future_->set_continuation_ptr(h, lock);
     lock.unlock();
     return BOOST_THREAD_FUTURE<Rp>(h);
   }

include/boost/thread/pthread/condition_variable_fwd.hpp

@@ -120,15 +120,6 @@ namespace boost
             unique_lock<mutex>& m,
             duration_type const& wait_duration)
         {
-            if (wait_duration.is_pos_infinity())
-            {
-                wait(m); // or do_wait(m,detail::timeout::sentinel());
-                return true;
-            }
-            if (wait_duration.is_special())
-            {
-                return true;
-            }
             return timed_wait(m,get_system_time()+wait_duration);
         }
 
@@ -158,18 +149,6 @@ namespace boost
             unique_lock<mutex>& m,
             duration_type const& wait_duration,predicate_type pred)
         {
-            if (wait_duration.is_pos_infinity())
-            {
-                while (!pred())
-                {
-                  wait(m); // or do_wait(m,detail::timeout::sentinel());
-                }
-                return true;
-            }
-            if (wait_duration.is_special())
-            {
-                return pred();
-            }
             return timed_wait(m,get_system_time()+wait_duration,pred);
         }
 #endif

include/boost/thread/win32/condition_variable.hpp

@@ -339,8 +339,8 @@ namespace boost
         {
           if (wait_duration.is_pos_infinity())
           {
-            wait(m); // or do_wait(m,detail::timeout::sentinel());
-            return true;
+              wait(m); // or do_wait(m,detail::timeout::sentinel());
+              return true;
           }
           if (wait_duration.is_special())
           {
@@ -362,18 +362,6 @@ namespace boost
         template<typename duration_type,typename predicate_type>
         bool timed_wait(unique_lock<mutex>& m,duration_type const& wait_duration,predicate_type pred)
         {
-            if (wait_duration.is_pos_infinity())
-            {
-              while (!pred())
-              {
-                wait(m); // or do_wait(m,detail::timeout::sentinel());
-              }
-              return true;
-            }
-            if (wait_duration.is_special())
-            {
-              return pred();
-            }
             return do_wait(m,wait_duration.total_milliseconds(),pred);
         }
 #endif

src/pthread/once.cpp

@@ -15,9 +15,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <memory>
-#if defined BOOST_THREAD_PATCH
-#include <string.h> // memcmp.
-#endif
+
 namespace boost
 {
     namespace thread_detail

src/pthread/thread.cpp

@@ -80,8 +80,6 @@ namespace boost
                 static void tls_destructor(void* data)
                 {
                     boost::detail::thread_data_base* thread_info=static_cast<boost::detail::thread_data_base*>(data);
-                    //boost::detail::thread_data_ptr thread_info = static_cast<boost::detail::thread_data_base*>(data)->shared_from_this();
-
                     if(thread_info)
                     {
                         while(!thread_info->tss_data.empty() || thread_info->thread_exit_callbacks)
@@ -126,8 +124,7 @@ namespace boost
                 }
                 ~delete_current_thread_tls_key_on_dlclose_t()
                 {
-                    const boost::once_flag uninitialized = BOOST_ONCE_INIT;
-                    if (memcmp(&current_thread_tls_init_flag, &uninitialized, sizeof(boost::once_flag)))
+                    if (current_thread_tls_init_flag.epoch!=BOOST_ONCE_INITIAL_FLAG_VALUE)
                     {
                         pthread_key_delete(current_thread_tls_key);
                     }
@@ -161,9 +158,8 @@ namespace boost
         {
             static void* thread_proxy(void* param)
             {
-                //boost::detail::thread_data_ptr thread_info = static_cast<boost::detail::thread_data_base*>(param)->self;
-                boost::detail::thread_data_ptr thread_info = static_cast<boost::detail::thread_data_base*>(param)->shared_from_this();
-                thread_info->self.reset();
+                boost::detail::thread_data_ptr thread_info = static_cast<boost::detail::thread_data_base*>(param)->self;
+                //thread_info->self.reset();
                 detail::set_current_thread_data(thread_info.get());
 #if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
                 BOOST_TRY
@@ -256,6 +252,7 @@ namespace boost
         {
             thread_info->self.reset();
             return false;
+//            boost::throw_exception(thread_resource_error(res, "boost thread: failed in pthread_create"));
         }
         return true;
     }
@@ -269,6 +266,7 @@ namespace boost
         {
             thread_info->self.reset();
             return false;
+//            boost::throw_exception(thread_resource_error(res, "boost thread: failed in pthread_create"));
         }
         int detached_state;
         res = pthread_attr_getdetachstate(h, &detached_state);
@@ -276,6 +274,7 @@ namespace boost
         {
             thread_info->self.reset();
             return false;
+//            boost::throw_exception(thread_resource_error(res, "boost thread: failed in pthread_attr_getdetachstate"));
         }
         if (PTHREAD_CREATE_DETACHED==detached_state)
         {

test/Jamfile.v2

@@ -298,7 +298,6 @@ rule thread-compile ( sources : reqs * : name )
           [ thread-compile test_10963.cpp : : test_10963_c ]
           [ thread-run test_10964.cpp ]
           [ thread-test test_11053.cpp ]
-          [ thread-run test_11266.cpp ]
     ;
 
 
@@ -810,10 +809,7 @@ rule thread-compile ( sources : reqs * : name )
           [ thread-run2 ../example/user_scheduler.cpp : ex_user_scheduler ]
           [ thread-run2 ../example/executor.cpp : ex_executor ]
           [ thread-run2 ../example/generic_executor_ref.cpp : ex_generic_executor_ref ]
-          [ thread-run2 ../example/generic_executor.cpp : ex_generic_executor ]
-          [ thread-run2 ../example/generic_serial_executor.cpp : ex_generic_serial_executor ]
           [ thread-run2 ../example/serial_executor.cpp : ex_serial_executor ]
-          [ thread-run2 ../example/generic_serial_executor_cont.cpp : ex_generic_serial_executor_cont ]
           [ thread-run2 ../example/serial_executor_cont.cpp : ex_serial_executor_cont ]
           [ thread-run2 ../example/future_when_all.cpp : ex_future_when_all ]
           [ thread-run2 ../example/parallel_accumulate.cpp : ex_parallel_accumulate ]
@@ -951,18 +947,11 @@ rule thread-compile ( sources : reqs * : name )
           [ thread-run2-noit ./experimental/parallel/v2/task_region_pass.cpp : task_region_p ]
     ;
     
-    explicit ts_other ;
-    test-suite ts_other
+    explicit ts_ ;
+    test-suite ts_
     :
           [ thread-run2 ../example/this_executor.cpp : ex_this_executor ]
           [ thread-run2 ../example/default_executor.cpp : ex_default_executor ]
     ;
 
-    explicit ts_ ;
-    test-suite ts_
-    :
-          #[ thread-run test_11256.cpp ]
-    ;
-
-
 }

test/sync/futures/future/then_deferred_pass.cpp

@@ -17,7 +17,6 @@
 
 #include <boost/thread/future.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#include <cassert>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
 
@@ -32,8 +31,6 @@ int p1()
 
 int p2(boost::future<int> f)
 {
-  assert(f.is_ready());
-
   BOOST_THREAD_LOG << "p2 <" << &f << BOOST_THREAD_END_LOG;
   BOOST_TEST(f.valid());
   int i = f.get();
@@ -44,7 +41,6 @@ int p2(boost::future<int> f)
 
 void p3(boost::future<int> f)
 {
-  assert(f.is_ready());
   BOOST_THREAD_LOG << "p3 <" << &f << BOOST_THREAD_END_LOG;
   BOOST_TEST(f.valid());
   int i = f.get();

test/sync/futures/future/then_executor_pass.cpp

@@ -20,7 +20,6 @@
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/thread/executor.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#include <cassert>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
 
@@ -35,7 +34,6 @@ int p1()
 
 int p2(boost::future<int> f)
 {
-  assert(f.is_ready());
   BOOST_THREAD_LOG << "p2 <" << &f << BOOST_THREAD_END_LOG;
   BOOST_TEST(f.valid());
   int i = f.get();
@@ -46,7 +44,6 @@ int p2(boost::future<int> f)
 
 void p3(boost::future<int> f)
 {
-  assert(f.is_ready());
   BOOST_THREAD_LOG << "p3 <" << &f << BOOST_THREAD_END_LOG;
   BOOST_TEST(f.valid());
   int i = f.get();

test/sync/mutual_exclusion/recursive_mutex/native_handle_pass.cpp

@@ -29,7 +29,7 @@ int main()
   boost::recursive_mutex::native_handle_type h = m.native_handle();
   BOOST_TEST(h);
 #else
-#error "Test not applicable: BOOST_THREAD_DEFINES_RECURSIVE_MUTEX_NATIVE_HANDLE not defined for this platform as not supported"
+#error "Test not applicable: BOOST_THREAD_DEFINES_CONDITION_VARIABLE_NATIVE_HANDLE not defined for this platform as not supported"
 #endif
 
   return boost::report_errors();

test/test_10963.cpp

@@ -8,12 +8,9 @@
 #if ! defined  BOOST_NO_CXX11_DECLTYPE
 #define BOOST_RESULT_OF_USE_DECLTYPE
 #endif
-#define BOOST_THREAD_PROVIDES_EXECUTORS
 
 #include <boost/thread/future.hpp>
 #include <boost/static_assert.hpp>
-#include <cassert>
-#include <boost/thread/executors/basic_thread_pool.hpp>
 
 
 struct TestCallback
@@ -22,14 +19,12 @@ struct TestCallback
 
     result_type operator()(boost::future<void> future) const
     {
-      assert(future.is_ready());
         future.get();
         return boost::make_ready_future();
     }
 
     result_type operator()(boost::future<boost::future<void> > future) const
     {
-      assert(future.is_ready());
        future.get();
        return boost::make_ready_future();
     }
@@ -38,24 +33,12 @@ struct TestCallback
 int main()
 {
 #if ! defined  BOOST_NO_CXX11_DECLTYPE && ! defined  BOOST_NO_CXX11_AUTO_DECLARATIONS
-  {
     boost::promise<void> test_promise;
     boost::future<void> test_future(test_promise.get_future());
     auto f1 = test_future.then(TestCallback());
     BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     auto f2 = f1.then(TestCallback());
     BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<boost::future<void> > >::value);
-  }
-  {
-    boost::basic_thread_pool executor;
-    boost::promise<void> test_promise;
-    boost::future<void> test_future(test_promise.get_future());
-    auto f1 = test_future.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
-    auto f2 = f1.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<boost::future<void> > >::value);
-
-  }
 #endif
     return 0;
 }

test/test_10964.cpp

@@ -8,12 +8,9 @@
 #if ! defined  BOOST_NO_CXX11_DECLTYPE
 #define BOOST_RESULT_OF_USE_DECLTYPE
 #endif
-#define BOOST_THREAD_PROVIDES_EXECUTORS
 
 #include <boost/thread/future.hpp>
 #include <boost/static_assert.hpp>
-#include <cassert>
-#include <boost/thread/executors/basic_thread_pool.hpp>
 
 struct TestCallback
 {
@@ -21,23 +18,13 @@ struct TestCallback
 
   result_type operator()(boost::future<void> future) const
   {
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-    assert(future.is_ready());
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-    future.wait();
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
+    future.get();
     return boost::make_ready_future();
   }
 
   result_type operator()(boost::future<boost::future<void> > future) const
   {
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-    assert(future.is_ready());
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-    assert(future.get().is_ready());
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-    //boost::future<void> ff = future.get();
-
+    future.get();
     return boost::make_ready_future();
   }
 };
@@ -48,8 +35,6 @@ void p1()
 
 int main()
 {
-  const int number_of_tests = 2;
-
 #if ! defined  BOOST_NO_CXX11_DECLTYPE && ! defined  BOOST_NO_CXX11_AUTO_DECLARATIONS
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
   {
@@ -58,104 +43,34 @@ int main()
     f1.wait();
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  for (int i=0; i< number_of_tests; i++)
   {
     auto f1 = boost::make_ready_future().then(TestCallback());
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
     BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
     auto f2 = f1.unwrap();
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
     BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<void> >::value);
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
     f2.wait();
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  for (int i=0; i< number_of_tests; i++)
-  {
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-    auto f1 = boost::make_ready_future().then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
-    boost::future<void> f2 = f1.get();
-    std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  }
-  std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  for (int i=0; i< number_of_tests; i++)
   {
     auto f1 = boost::make_ready_future().then(TestCallback());
     BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     auto f2 = f1.unwrap();
     BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<void> >::value);
     auto f3 = f2.then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     f3.wait();
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  for (int i=0; i< number_of_tests; i++)
   {
         boost::make_ready_future().then(
             TestCallback()).unwrap().then(TestCallback()).get();
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  for (int i=0; i< number_of_tests; i++)
   {
     boost::future<void> f = boost::async(p1);
     f.then(
             TestCallback()).unwrap().then(TestCallback()).get();
   }
-  std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  for (int i=0; i< number_of_tests; i++)
-  {
-    auto f1 = boost::make_ready_future().then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
-    auto f3 = f1.then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
-    f3.wait();
-  }
-
-
-  std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  for (int i=0; i< number_of_tests; i++)
-  {
-    boost::basic_thread_pool executor;
-    auto f1 = boost::make_ready_future().then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
-    auto f3 = f1.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
-    f3.wait();
-  }
-  std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  for (int i=0; i< number_of_tests; i++)
-  {
-    boost::basic_thread_pool executor(1);
-
-    auto f1 = boost::make_ready_future().then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
-    std::cout << __FILE__ << "[" << __LINE__ << "] " << int(f1.valid()) << std::endl;
-    auto f2 = f1.unwrap();
-    std::cout << __FILE__ << "[" << __LINE__ << "] " << int(f2.valid()) << std::endl;
-
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<void> >::value);
-    auto f3 = f2.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
-    f3.wait();
-  }
-  std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-  for (int i=0; i< number_of_tests; i++)
-  {
-    boost::basic_thread_pool executor;
-
-    auto f1 = boost::make_ready_future().then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
-    auto f2 = f1.unwrap();
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<void> >::value);
-    auto f3 = f2.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
-    f3.wait();
-  }
-  std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-
 #endif
   return 0;
 }

test/test_11256.cpp

@@ -1,42 +0,0 @@
-// Copyright (C) 2015 Vicente Botet
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#define BOOST_THREAD_VERSION 4
-#define BOOST_THREAD_PROVIDES_EXECUTORS
-
-#include <boost/thread.hpp>
-#include <boost/thread/thread_pool.hpp>
-#include <cassert>
-
-auto createFuture()
-{
-    boost::promise<void> promise;
-    promise.set_value();
-    return promise.get_future();
-}
-
-auto stepOne(boost::basic_thread_pool &executor)
-{
-    auto sendFuture = createFuture();
-    auto wrappedFuture = sendFuture.then(executor, [](auto f) mutable {
-        return createFuture();
-    });
-
-    return wrappedFuture.unwrap();
-}
-
-auto stepTwo(boost::basic_thread_pool &executor)
-{
-    auto future = stepOne(executor);
-    return future.then(executor, [](auto f) {
-        assert(f.is_ready());
-    });
-}
-
-int main()
-{
-    boost::basic_thread_pool executor{1};
-    stepTwo(executor).get();
-}

test/test_11266.cpp

@@ -1,29 +0,0 @@
-// Copyright (C) 2015 Vicente Botet
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#define BOOST_THREAD_VERSION 4
-
-#include <boost/thread/future.hpp>
-
-void func(int) { }
-
-int main()
-{
-#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
-  {
-  boost::packaged_task<void(int)> task{func};
-  }
-  {
-    boost::packaged_task<void(int)> task{func};
-
-    task(0);
-  }
-  {
-    boost::packaged_task<void(int)> task{func};
-    int x = 0;
-    task(x);
-  }
-#endif
-}

test/test_scheduled_tp.cpp

@@ -24,7 +24,7 @@
 
 using namespace boost::chrono;
 
-typedef boost::scheduled_thread_pool<> scheduled_tp;
+typedef boost::scheduled_thread_pool scheduled_tp;
 
 void fn(int x)
 {
@@ -46,18 +46,19 @@ void func2(scheduled_tp* tp, steady_clock::duration d)
 void test_timing(const int n)
 {
   //This function should take n seconds to execute.
-  boost::scheduled_thread_pool<> se(4);
+  boost::scheduled_thread_pool se(4);
 
   for(int i = 1; i <= n; i++)
   {
     se.submit_after(boost::bind(fn,i), milliseconds(i*100));
   }
+  boost::this_thread::sleep_for(boost::chrono::seconds(10));
   //dtor is called here so all task will have to be executed before we return
 }
 
 void test_deque_timing()
 {
-    boost::scheduled_thread_pool<> se(4);
+    boost::scheduled_thread_pool se(4);
     for(int i = 0; i < 10; i++)
     {
         steady_clock::duration d = milliseconds(i*100);
@@ -84,10 +85,10 @@ void test_deque_multi(const int n)
 
 int main()
 {
-  //steady_clock::time_point start = steady_clock::now();
+  steady_clock::time_point start = steady_clock::now();
   test_timing(5);
-  //steady_clock::duration diff = steady_clock::now() - start;
-  //BOOST_TEST(diff > milliseconds(500));
+  steady_clock::duration diff = steady_clock::now() - start;
+  BOOST_TEST(diff > milliseconds(500));
   test_deque_timing();
   test_deque_multi(4);
   test_deque_multi(8);

test/test_scheduler.cpp

@@ -27,6 +27,7 @@ typedef boost::executors::basic_thread_pool thread_pool;
 
 void fn(int x)
 {
+  //std::cout << "[" << __LINE__ << "] " << steady_clock::now() << std::endl;
     std::cout << x << std::endl;
 }
 
@@ -74,7 +75,7 @@ int main()
   test_after(5, sch);
   test_at(5, sch);
   test_on(5, sch, tp);
-  std::cout << "[" << __LINE__ << "] " << std::endl;
+  boost::this_thread::sleep_for(boost::chrono::seconds(10));
 
   return boost::report_errors();
 }

test/test_scheduling_adaptor.cpp

@@ -28,6 +28,7 @@ typedef boost::executors::basic_thread_pool thread_pool;
 
 void fn(int x)
 {
+  //std::cout << "[" << __LINE__ << "] " << steady_clock::now() << std::endl;
     std::cout << x << std::endl;
 }
 
@@ -40,10 +41,14 @@ void test_timing(const int n)
         sa.submit_after(boost::bind(fn,i),seconds(i));
         sa.submit_after(boost::bind(fn,i), milliseconds(i*100));
     }
+    boost::this_thread::sleep_for(boost::chrono::seconds(10));
 }
 
 int main()
 {
+  steady_clock::time_point start = steady_clock::now();
   test_timing(5);
+  steady_clock::duration diff = steady_clock::now() - start;
+  BOOST_TEST(diff > seconds(5));
   return boost::report_errors();
 }

test/threads/thread/constr/FArgs_pass.cpp

@@ -26,9 +26,9 @@
 unsigned throw_one = 0xFFFF;
 
 #if defined _GLIBCXX_THROW
-inline void* operator new(std::size_t s) _GLIBCXX_THROW (std::bad_alloc)
+void* operator new(std::size_t s) _GLIBCXX_THROW (std::bad_alloc)
 #elif defined BOOST_MSVC
-inline void* operator new(std::size_t s)
+void* operator new(std::size_t s)
 #else
 void* operator new(std::size_t s) throw (std::bad_alloc)
 #endif
@@ -40,9 +40,9 @@ void* operator new(std::size_t s) throw (std::bad_alloc)
 }
 
 #if defined BOOST_MSVC
-inline void operator delete(void* p)
+void operator delete(void* p)
 #else
-inline void operator delete(void* p) throw ()
+void operator delete(void* p) throw ()
 #endif
 {
   std::cout << __FILE__ << ":" << __LINE__ << std::endl;

test/threads/thread/constr/lambda_pass.cpp

@@ -28,9 +28,9 @@
 unsigned throw_one = 0xFFFF;
 
 #if defined _GLIBCXX_THROW
-inline void* operator new(std::size_t s) _GLIBCXX_THROW (std::bad_alloc)
+void* operator new(std::size_t s) _GLIBCXX_THROW (std::bad_alloc)
 #elif defined BOOST_MSVC
-inline void* operator new(std::size_t s)
+void* operator new(std::size_t s)
 #else
 void* operator new(std::size_t s) throw (std::bad_alloc)
 #endif
@@ -41,9 +41,9 @@ void* operator new(std::size_t s) throw (std::bad_alloc)
 }
 
 #if defined BOOST_MSVC
-inline void operator delete(void* p)
+void operator delete(void* p)
 #else
-inline void operator delete(void* p) throw ()
+void operator delete(void* p) throw ()
 #endif
 {
   std::free(p);