Merge pull request #2871 from STEllAR-GROUP/fix_throttle

Adding missing support for throttling scheduler
STEllAR-GROUP · Sep 4, 2017 · ee5303e · ee5303e
2 parents 8b3e3dd + e16c7bd
commit ee5303e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/src/runtime/threads/detail/scheduled_thread_pool.cpp b/src/runtime/threads/detail/scheduled_thread_pool.cpp
@@ -51,3 +51,9 @@ template class HPX_EXPORT hpx::threads::detail::scheduled_thread_pool<
 template class HPX_EXPORT hpx::threads::detail::scheduled_thread_pool<
     hpx::threads::policies::periodic_priority_queue_scheduler<>>;
 #endif
+
+#if defined(HPX_HAVE_THROTTLING_SCHEDULER)
+#include <hpx/runtime/threads/policies/throttling_scheduler.hpp>
+template class HPX_EXPORT hpx::threads::detail::scheduled_thread_pool<
+    hpx::threads::policies::throttling_scheduler<>>;
+#endif
diff --git a/src/runtime/threads/threadmanager.cpp b/src/runtime/threads/threadmanager.cpp
@@ -711,7 +711,36 @@ namespace hpx { namespace threads
 
             case resource::throttle:
             {
-#if !defined(HPX_HAVE_THROTTLING_SCHEDULER)
+#if defined(HPX_HAVE_THROTTLING_SCHEDULER)
+                // set parameters for scheduler and pool instantiation and
+                // perform compatibility checks
+                hpx::detail::ensure_high_priority_compatibility(cfg_.vm_);
+                hpx::detail::ensure_hierarchy_arity_compatibility(cfg_.vm_);
+                std::string affinity_desc;
+                std::size_t numa_sensitive =
+                    hpx::detail::get_affinity_description(cfg_, affinity_desc);
+
+                // instantiate the scheduler
+                typedef hpx::threads::policies::throttling_scheduler<>
+                    local_sched_type;
+                local_sched_type::init_parameter_type init(num_threads_in_pool,
+                    1000, numa_sensitive, "throttling_scheduler");
+                std::unique_ptr<local_sched_type> sched(
+                    new local_sched_type(init));
+
+                // instantiate the pool
+                std::unique_ptr<detail::thread_pool_base> pool(
+                    new hpx::threads::detail::scheduled_thread_pool<
+                            local_sched_type
+                        >(std::move(sched),
+                        notifier_, i, name.c_str(),
+                        policies::scheduler_mode(policies::do_background_work |
+                            policies::reduce_thread_priority |
+                            policies::delay_exit),
+                        thread_offset));
+                pools_.push_back(std::move(pool));
+
+#else
                 throw hpx::detail::command_line_error(
                     "Command line option "
                     "--hpx:queuing=throttle "