Unified threadmanager_base and threadmanager_impl

STEllAR-GROUP · Jul 25, 2017 · dec1b36 · dec1b36
1 parent 60bad95
commit dec1b36
Show file tree

Hide file tree

Showing 25 changed files with 481 additions and 741 deletions.
diff --git a/examples/balancing/os_thread_num.cpp b/examples/balancing/os_thread_num.cpp
@@ -23,7 +23,6 @@ using boost::program_options::value;
 
 using hpx::lcos::local::barrier;
 
-using hpx::threads::threadmanager_base;
 using hpx::threads::pending;
 using hpx::threads::thread_priority_normal;
 

diff --git a/examples/resource_partitioner/system_characteristics.h b/examples/resource_partitioner/system_characteristics.h
@@ -22,7 +22,7 @@ void print_system_characteristics()
     hpx::runtime* rt = hpx::get_runtime_ptr();
     hpx::util::runtime_configuration cfg = rt->get_config();
     const hpx::threads::topology& topo = rt->get_topology();
-    hpx::threads::threadmanager_base& thrd_manager = rt->get_thread_manager();
+    hpx::threads::threadmanager& thrd_manager = rt->get_thread_manager();
 
     // -------------------------------------- //
     //      print runtime characteristics     //

diff --git a/hpx/runtime.hpp b/hpx/runtime.hpp
@@ -191,7 +191,7 @@ namespace hpx
         virtual parcelset::parcelhandler& get_parcel_handler() = 0;
         virtual parcelset::parcelhandler const& get_parcel_handler() const = 0;
 
-        virtual threads::threadmanager_base& get_thread_manager() = 0;
+        virtual threads::threadmanager& get_thread_manager() = 0;
 
         virtual naming::resolver_client& get_agas_client() = 0;
 

diff --git a/hpx/runtime/applier/applier.hpp b/hpx/runtime/applier/applier.hpp
@@ -39,7 +39,7 @@ namespace hpx { namespace applier
 
     public:
         // constructor
-        applier(parcelset::parcelhandler &ph, threads::threadmanager_base& tm);
+        applier(parcelset::parcelhandler &ph, threads::threadmanager& tm);
 
         // destructor
         ~applier()
@@ -66,7 +66,7 @@ namespace hpx { namespace applier
         ///
         /// This function returns a reference to the thread manager this
         /// applier instance has been created with.
-        threads::threadmanager_base& get_thread_manager();
+        threads::threadmanager& get_thread_manager();
 
         /// \brief Allow access to the locality of the locality this applier
         ///        instance is associated with.
@@ -172,7 +172,7 @@ namespace hpx { namespace applier
 
     private:
         parcelset::parcelhandler& parcel_handler_;
-        threads::threadmanager_base& thread_manager_;
+        threads::threadmanager& thread_manager_;
         naming::id_type runtime_support_id_;
         naming::id_type memory_id_;
     };

diff --git a/hpx/runtime/parcelset/parcelhandler.hpp b/hpx/runtime/parcelset/parcelhandler.hpp
@@ -99,7 +99,7 @@ namespace hpx { namespace parcelset
         ///                 transport operations the parcelhandler carries out.
         parcelhandler(
             util::runtime_configuration& cfg,
-            threads::threadmanager_base* tm,
+            threads::threadmanager* tm,
             util::function_nonser<void(std::size_t, char const*)> const& on_start_thread,
             util::function_nonser<void()> const& on_stop_thread);
 
@@ -477,7 +477,7 @@ namespace hpx { namespace parcelset
         endpoints_type endpoints_;
 
         /// the thread-manager to use (optional)
-        threads::threadmanager_base* tm_;
+        threads::threadmanager* tm_;
 
         /// Allow to use alternative parcel-ports (this is enabled only after
         /// the runtime systems of all localities are guaranteed to have

diff --git a/hpx/runtime/resource_partitioner.hpp b/hpx/runtime/resource_partitioner.hpp
@@ -25,6 +25,7 @@
 #include <boost/format.hpp>
 
 #include <algorithm>
+#include <cstddef>
 #include <iosfwd>
 #include <stdexcept>
 #include <string>
@@ -38,35 +39,35 @@ namespace resource {
 
 // if the resource partitioner is accessed before the HPX runtime has started
 // then on first access, this function should be used, to ensure that command line
-// affinity binding options are honoured. Use this function signature only once
+// affinity binding options are honored. Use this function signature only once
 // and thereafter use the parameter free version.
-extern HPX_EXPORT hpx::resource::resource_partitioner &get_resource_partitioner(
-    int argc, char **argv);
-extern HPX_EXPORT hpx::resource::resource_partitioner &get_resource_partitioner(
+extern HPX_EXPORT resource::resource_partitioner& get_resource_partitioner(
+    int argc, char** argv);
+extern HPX_EXPORT resource::resource_partitioner& get_resource_partitioner(
     boost::program_options::options_description desc_cmdline, int argc,
-    char **argv, bool check = true);
-extern HPX_EXPORT hpx::resource::resource_partitioner &get_resource_partitioner(
-    int argc, char **argv, std::vector<std::string> ini_config);
-extern HPX_EXPORT hpx::resource::resource_partitioner &get_resource_partitioner(
-    int argc, char **argv, runtime_mode mode);
-extern HPX_EXPORT hpx::resource::resource_partitioner &get_resource_partitioner(
+    char** argv, bool check = true);
+extern HPX_EXPORT resource::resource_partitioner& get_resource_partitioner(
+    int argc, char** argv, std::vector<std::string> ini_config);
+extern HPX_EXPORT resource::resource_partitioner& get_resource_partitioner(
+    int argc, char** argv, runtime_mode mode);
+extern HPX_EXPORT resource::resource_partitioner& get_resource_partitioner(
     boost::program_options::options_description desc_cmdline, int argc,
-    char **argv, std::vector<std::string> ini_config);
-extern HPX_EXPORT hpx::resource::resource_partitioner &get_resource_partitioner(
+    char** argv, std::vector<std::string> ini_config);
+extern HPX_EXPORT resource::resource_partitioner& get_resource_partitioner(
     boost::program_options::options_description desc_cmdline, int argc,
-    char **argv, runtime_mode mode);
-extern HPX_EXPORT hpx::resource::resource_partitioner &get_resource_partitioner(
-    int argc, char **argv, std::vector<std::string> ini_config,
+    char** argv, runtime_mode mode);
+extern HPX_EXPORT resource::resource_partitioner& get_resource_partitioner(
+    int argc, char** argv, std::vector<std::string> ini_config,
     runtime_mode mode);
-extern HPX_EXPORT hpx::resource::resource_partitioner &get_resource_partitioner(
+extern HPX_EXPORT resource::resource_partitioner& get_resource_partitioner(
     boost::program_options::options_description desc_cmdline, int argc,
-    char **argv, std::vector<std::string> ini_config, runtime_mode mode,
+    char** argv, std::vector<std::string> ini_config, runtime_mode mode,
     bool check = true);
 
 // may be used anywhere in code and returns a reference to the
 // single, global resource partitioner
-extern HPX_EXPORT hpx::resource::resource_partitioner &
-get_resource_partitioner();
+extern HPX_EXPORT hpx::resource::resource_partitioner&
+    get_resource_partitioner();
 
 namespace resource {
 
@@ -239,8 +240,9 @@ namespace resource {
         // stuff that has to be done during hpx_init ...
         void set_scheduler(
             scheduling_policy sched, const std::string &pool_name);
-        void set_threadmanager(threads::threadmanager_base *thrd_manag);
-        threads::threadmanager_base *get_thread_manager() const;
+
+        void set_threadmanager(threads::threadmanager *thrd_manag);
+        threads::threadmanager *get_thread_manager() const;
 
         // called by constructor of scheduler_base
         threads::policies::detail::affinity_data *get_affinity_data()
@@ -254,11 +256,7 @@ namespace resource {
         void configure_pools();
 
         // called in runtime::assign_cores()
-        size_t init()
-        {
-            thread_manager_->init();
-            return cores_needed_;
-        }
+        std::size_t init();
 
         ////////////////////////////////////////////////////////////////////////
 
@@ -328,7 +326,7 @@ namespace resource {
         std::vector<init_pool_data> initial_thread_pools_;
 
         // pointer to the threadmanager instance
-        hpx::threads::threadmanager_base *thread_manager_;
+        hpx::threads::threadmanager *thread_manager_;
 
         // reference to the topology and affinity data
         threads::hwloc_topology_info &topology_;

diff --git a/hpx/runtime/threads/detail/thread_pool_impl.hpp b/hpx/runtime/threads/detail/thread_pool_impl.hpp
@@ -14,7 +14,6 @@
 #include <hpx/runtime/threads/policies/affinity_data.hpp>
 #include <hpx/runtime/threads/policies/scheduler_base.hpp>
 #include <hpx/runtime/threads/policies/schedulers.hpp>
-#include <hpx/runtime/threads/threadmanager_impl.hpp>
 #include <hpx/util/high_resolution_clock.hpp>
 #include <hpx/util/unlock_guard.hpp>
 

diff --git a/hpx/runtime/threads/executors/customized_pool_executors.hpp b/hpx/runtime/threads/executors/customized_pool_executors.hpp
@@ -8,12 +8,11 @@
 
 #include <hpx/compat/mutex.hpp>
 #include <hpx/runtime/threads/detail/thread_pool.hpp>
+#include <hpx/runtime/threads/thread_executor.hpp>
 #include <hpx/util/steady_clock.hpp>
 #include <hpx/util/thread_description.hpp>
 #include <hpx/util/unique_function.hpp>
 
-#include <hpx/runtime/threads/threadmanager_impl.hpp>
-
 #include <string>
 
 #include <hpx/config/warnings_prefix.hpp>

diff --git a/hpx/runtime/threads/thread_data_fwd.hpp b/hpx/runtime/threads/thread_data_fwd.hpp
@@ -32,11 +32,9 @@ namespace hpx
 namespace hpx { namespace threads
 {
     /// \cond NOINTERNAL
-    struct HPX_EXPORT threadmanager_base;
+    class HPX_EXPORT threadmanager;
     struct HPX_EXPORT topology;
 
-    class HPX_EXPORT threadmanager_impl;
-
     class HPX_EXPORT executor;
 
     typedef coroutines::coroutine coroutine_type;
@@ -123,7 +121,7 @@ namespace hpx { namespace threads
     /// \cond NOINTERNAL
     // The function get_thread_manager returns a reference to the
     // current thread manager.
-    HPX_API_EXPORT threadmanager_base& get_thread_manager();
+    HPX_API_EXPORT threadmanager& get_thread_manager();
     /// \endcond
 
     /// The function \a get_thread_count returns the number of currently