Fix incorrect pool usage masks setup in RP/thread manager

STEllAR-GROUP · Aug 31, 2017 · 23d9710 · 23d9710
1 parent d374d7c
commit 23d9710
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/runtime.cpp b/src/runtime.cpp
@@ -665,8 +665,6 @@ namespace hpx
         std::size_t cores_needed =
             hpx::resource::get_partitioner().assign_cores(first_core);
 
-        // this initializes the used_processing_units_ mask
-        get_thread_manager().init();
         return static_cast<std::uint32_t>(cores_needed);
     }
 

diff --git a/src/runtime/threads/detail/thread_pool_base.cpp b/src/runtime/threads/detail/thread_pool_base.cpp
@@ -95,7 +95,7 @@ namespace hpx { namespace threads { namespace detail
         auto const& rp = resource::get_partitioner();
         for (std::size_t i = 0; i != pool_threads; ++i)
         {
-            bit_or(used_processing_units_, rp.get_pu_mask(threads_offset + i));
+            used_processing_units_ |= rp.get_pu_mask(threads_offset + i);
         }
     }
 }}}

diff --git a/src/runtime_impl.cpp b/src/runtime_impl.cpp
@@ -170,6 +170,9 @@ namespace hpx {
         // now create all threadmanager pools
         thread_manager_->create_pools();
 
+        // this initializes the used_processing_units_ mask
+        thread_manager_->init();
+
         // now, launch AGAS and register all nodes, launch all other components
         agas_client_.initialize(
             parcel_handler_, std::uint64_t(runtime_support_.get()),