Remove unused scheduler data members.

Author: chriskohlhoff

asio/include/asio/detail/impl/resolver_service_base.ipp

@@ -44,7 +44,7 @@ private:
 
 resolver_service_base::resolver_service_base(execution_context& context)
   : scheduler_(asio::use_service<scheduler_impl>(context)),
-    work_scheduler_(new scheduler_impl(context, false)),
+    work_scheduler_(new scheduler_impl(context)),
     work_thread_(),
     scheduler_locking_(config(context).get("scheduler", "locking", true))
 {

asio/include/asio/detail/impl/scheduler.ipp

@@ -109,55 +109,33 @@ struct scheduler::work_cleanup
 };
 
 scheduler::scheduler(asio::execution_context& ctx,
-    bool own_thread, get_task_func_type get_task)
+    get_task_func_type get_task)
   : asio::detail::execution_context_service_base<scheduler>(ctx),
     one_thread_(config(ctx).get("scheduler", "concurrency_hint", 0) == 1),
     mutex_(config(ctx).get("scheduler", "locking", true),
         config(ctx).get("scheduler", "locking_spin_count", 0)),
     task_(0),
     get_task_(get_task),
     task_interrupted_(true),
-    outstanding_work_(0),
     stopped_(false),
     shutdown_(false),
-    concurrency_hint_(config(ctx).get("scheduler", "concurrency_hint", 0)),
+    outstanding_work_(0),
     task_usec_(config(ctx).get("scheduler", "task_usec", -1L)),
-    wait_usec_(config(ctx).get("scheduler", "wait_usec", -1L)),
-    thread_()
+    wait_usec_(config(ctx).get("scheduler", "wait_usec", -1L))
 {
   ASIO_HANDLER_TRACKING_INIT;
-
-  if (own_thread)
-  {
-    ++outstanding_work_;
-    signal_blocker sb;
-    thread_ = thread(thread_function(this));
-  }
 }
 
 scheduler::~scheduler()
 {
-  if (thread_.joinable())
-  {
-    mutex::scoped_lock lock(mutex_);
-    shutdown_ = true;
-    stop_all_threads(lock);
-    lock.unlock();
-    thread_.join();
-  }
 }
 
 void scheduler::shutdown()
 {
   mutex::scoped_lock lock(mutex_);
   shutdown_ = true;
-  if (thread_.joinable())
-    stop_all_threads(lock);
   lock.unlock();
 
-  // Join thread to ensure task operation is returned to queue.
-  thread_.join();
-
   // Destroy handler objects.
   while (!op_queue_.empty())
   {

asio/include/asio/detail/impl/win_iocp_io_context.ipp

@@ -79,7 +79,7 @@ struct win_iocp_io_context::timer_thread_function
 };
 
 win_iocp_io_context::win_iocp_io_context(
-    asio::execution_context& ctx, bool own_thread)
+    asio::execution_context& ctx)
   : execution_context_service_base<win_iocp_io_context>(ctx),
     iocp_(),
     outstanding_work_(0),
@@ -102,21 +102,10 @@ win_iocp_io_context::win_iocp_io_context(
         asio::error::get_system_category());
     asio::detail::throw_error(ec, "iocp");
   }
-
-  if (own_thread)
-  {
-    ::InterlockedIncrement(&outstanding_work_);
-    thread_ = thread(thread_function(this));
-  }
 }
 
 win_iocp_io_context::~win_iocp_io_context()
 {
-  if (thread_.joinable())
-  {
-    stop();
-    thread_.join();
-  }
 }
 
 void win_iocp_io_context::shutdown()
@@ -130,13 +119,6 @@ void win_iocp_io_context::shutdown()
     ::SetWaitableTimer(waitable_timer_.handle, &timeout, 1, 0, 0, FALSE);
   }
 
-  if (thread_.joinable())
-  {
-    stop();
-    thread_.join();
-    ::InterlockedDecrement(&outstanding_work_);
-  }
-
   while (::InterlockedExchangeAdd(&outstanding_work_, 0) > 0)
   {
     op_queue<win_iocp_operation> ops;

asio/include/asio/detail/scheduler.hpp

@@ -48,7 +48,6 @@ class scheduler
 
   // Constructor.
   ASIO_DECL scheduler(asio::execution_context& ctx,
-      bool own_thread = true,
       get_task_func_type get_task = &scheduler::get_default_task);
 
   // Destructor.
@@ -203,29 +202,23 @@ class scheduler
   // Whether the task has been interrupted.
   bool task_interrupted_;
 
-  // The count of unfinished work.
-  atomic_count outstanding_work_;
-
-  // The queue of handlers that are ready to be delivered.
-  op_queue<operation> op_queue_;
-
   // Flag to indicate that the dispatcher has been stopped.
   bool stopped_;
 
   // Flag to indicate that the dispatcher has been shut down.
   bool shutdown_;
 
-  // The concurrency hint used to initialise the scheduler.
-  const int concurrency_hint_;
+  // The count of unfinished work.
+  atomic_count outstanding_work_;
+
+  // The queue of handlers that are ready to be delivered.
+  op_queue<operation> op_queue_;
 
   // The time limit on running the scheduler task, in microseconds.
   const long task_usec_;
 
   // The time limit on waiting when the queue is empty, in microseconds.
   const long wait_usec_;
-
-  // The thread that is running the scheduler.
-  thread thread_;
 };
 
 } // namespace detail

asio/include/asio/detail/win_iocp_io_context.hpp

@@ -45,8 +45,8 @@ class win_iocp_io_context
 {
 public:
   // Constructor.
-  ASIO_DECL win_iocp_io_context(
-      asio::execution_context& ctx, bool own_thread = true);
+  ASIO_DECL explicit win_iocp_io_context(
+      asio::execution_context& ctx);
 
   // Destructor.
   ASIO_DECL ~win_iocp_io_context();
@@ -320,9 +320,6 @@ class win_iocp_io_context
 
   // The concurrency hint used to initialise the io_context.
   const int concurrency_hint_;
-
-  // The thread that is running the io_context.
-  thread thread_;
 };
 
 } // namespace detail

asio/include/asio/impl/io_context.hpp

@@ -32,7 +32,7 @@ namespace asio {
 template <typename Allocator>
 io_context::io_context(allocator_arg_t, const Allocator& a)
   : execution_context(std::allocator_arg, a, config_from_concurrency_hint()),
-    impl_(asio::make_service<impl_type>(*this, false))
+    impl_(asio::make_service<impl_type>(*this))
 {
 }
 
@@ -41,15 +41,15 @@ io_context::io_context(allocator_arg_t,
     const Allocator& a, int concurrency_hint)
   : execution_context(std::allocator_arg, a,
       config_from_concurrency_hint(concurrency_hint)),
-    impl_(asio::make_service<impl_type>(*this, false))
+    impl_(asio::make_service<impl_type>(*this))
 {
 }
 
 template <typename Allocator>
 io_context::io_context(allocator_arg_t, const Allocator& a,
     const execution_context::service_maker& initial_services)
   : execution_context(std::allocator_arg, a, initial_services),
-    impl_(asio::make_service<impl_type>(*this, false))
+    impl_(asio::make_service<impl_type>(*this))
 {
 }
 

asio/include/asio/impl/io_context.ipp

@@ -35,19 +35,19 @@ namespace asio {
 
 io_context::io_context()
   : execution_context(config_from_concurrency_hint()),
-    impl_(asio::make_service<impl_type>(*this, false))
+    impl_(asio::make_service<impl_type>(*this))
 {
 }
 
 io_context::io_context(int concurrency_hint)
   : execution_context(config_from_concurrency_hint(concurrency_hint)),
-    impl_(asio::make_service<impl_type>(*this, false))
+    impl_(asio::make_service<impl_type>(*this))
 {
 }
 
 io_context::io_context(const execution_context::service_maker& initial_services)
   : execution_context(initial_services),
-    impl_(asio::make_service<impl_type>(*this, false))
+    impl_(asio::make_service<impl_type>(*this))
 {
 }
 

asio/include/asio/impl/system_context.ipp

@@ -45,7 +45,7 @@ struct system_context::thread_function
 };
 
 system_context::system_context()
-  : scheduler_(add_scheduler(new detail::scheduler(*this, false))),
+  : scheduler_(add_scheduler(new detail::scheduler(*this))),
     threads_(std::allocator<void>())
 {
   scheduler_.work_started();

asio/include/asio/impl/thread_pool.hpp

@@ -32,7 +32,7 @@ namespace asio {
 template <typename Allocator>
 thread_pool::thread_pool(allocator_arg_t, const Allocator& a)
   : execution_context(std::allocator_arg, a),
-    scheduler_(asio::make_service<detail::scheduler>(*this, false)),
+    scheduler_(asio::make_service<detail::scheduler>(*this)),
     threads_(allocator<void>(*this)),
     num_threads_(default_thread_pool_size()),
     joinable_(true)
@@ -47,7 +47,7 @@ thread_pool::thread_pool(allocator_arg_t,
     const Allocator& a, std::size_t num_threads)
   : execution_context(std::allocator_arg, a,
       config_from_concurrency_hint(num_threads == 1 ? 1 : 0)),
-    scheduler_(asio::make_service<detail::scheduler>(*this, false)),
+    scheduler_(asio::make_service<detail::scheduler>(*this)),
     threads_(allocator<void>(*this)),
     num_threads_(clamp_thread_pool_size(num_threads)),
     joinable_(true)
@@ -60,7 +60,7 @@ thread_pool::thread_pool(allocator_arg_t,
     const Allocator& a, std::size_t num_threads,
     const execution_context::service_maker& initial_services)
   : execution_context(std::allocator_arg, a, initial_services),
-    scheduler_(asio::make_service<detail::scheduler>(*this, false)),
+    scheduler_(asio::make_service<detail::scheduler>(*this)),
     threads_(allocator<void>(*this)),
     num_threads_(clamp_thread_pool_size(num_threads)),
     joinable_(true)

asio/include/asio/impl/thread_pool.ipp

@@ -56,7 +56,7 @@ long thread_pool::default_thread_pool_size()
 }
 
 thread_pool::thread_pool()
-  : scheduler_(asio::make_service<detail::scheduler>(*this, false)),
+  : scheduler_(asio::make_service<detail::scheduler>(*this)),
     threads_(allocator<void>(*this)),
     num_threads_(default_thread_pool_size()),
     joinable_(true)
@@ -78,7 +78,7 @@ long thread_pool::clamp_thread_pool_size(std::size_t n)
 
 thread_pool::thread_pool(std::size_t num_threads)
   : execution_context(config_from_concurrency_hint(num_threads == 1 ? 1 : 0)),
-    scheduler_(asio::make_service<detail::scheduler>(*this, false)),
+    scheduler_(asio::make_service<detail::scheduler>(*this)),
     threads_(allocator<void>(*this)),
     num_threads_(clamp_thread_pool_size(num_threads)),
     joinable_(true)
@@ -89,7 +89,7 @@ thread_pool::thread_pool(std::size_t num_threads)
 thread_pool::thread_pool(std::size_t num_threads,
     const execution_context::service_maker& initial_services)
   : execution_context(initial_services),
-    scheduler_(asio::make_service<detail::scheduler>(*this, false)),
+    scheduler_(asio::make_service<detail::scheduler>(*this)),
     threads_(allocator<void>(*this)),
     num_threads_(clamp_thread_pool_size(num_threads)),
     joinable_(true)