Merge pull request #2789 from STEllAR-GROUP/resource_partitioner

Resource partitioner
STEllAR-GROUP · Aug 23, 2017 · 6c214b2 · 6c214b2
2 parents 027ac11 + 78b4f27
commit 6c214b2
Show file tree

Hide file tree

Showing 101 changed files with 10,586 additions and 4,748 deletions.
diff --git a/.clang-format b/.clang-format
@@ -61,7 +61,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DerivePointerAlignment: true
+DerivePointerAlignment: false
 ExperimentalAutoDetectBinPacking: true
 FixNamespaceComments: false
 # ForEachMacros: ['']

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -646,6 +646,21 @@ foreach(_scheduler ${HPX_WITH_THREAD_SCHEDULERS_UC})
   unset(_all)
 endforeach()
 
+## Experimental settings
+hpx_option(HPX_WITH_IO_POOL BOOL
+  "Disable internal IO thread pool, do not change if not absolutely necessary (default: ON)"
+  ON CATEGORY "Thread Manager" ADVANCED)
+if(HPX_WITH_IO_POOL)
+  hpx_add_config_define(HPX_HAVE_IO_POOL)
+endif()
+
+hpx_option(HPX_WITH_TIMER_POOL BOOL
+  "Disable internal timer thread pool, do not change if not absolutely necessary (default: ON)"
+  ON CATEGORY "Thread Manager" ADVANCED)
+if(HPX_WITH_TIMER_POOL)
+  hpx_add_config_define(HPX_HAVE_TIMER_POOL)
+endif()
+
 ## AGAS related build options
 hpx_option(HPX_WITH_AGAS_DUMP_REFCNT_ENTRIES BOOL
   "Enable dumps of the AGAS refcnt tables to logs (default: OFF)"

diff --git a/docs/manual/existing_performance_counters.qbk b/docs/manual/existing_performance_counters.qbk
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -21,6 +21,7 @@ set(subdirs
     quickstart
     qt
     random_mem_access
+    resource_partitioner
     spell_check
     startup_shutdown
     thread_aware_timer

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/CMakeLists.txt b/examples/resource_partitioner/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Copyright (c) 2017 Shoshana Jakobovits
+#
+# 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)
+
+set(example_programs
+  oversubscribing_resource_partitioner
+  simple_resource_partitioner
+)
+
+set(oversubscribing_resource_partitioner_FLAGS DEPENDENCIES iostreams_component)
+set(simple_resource_partitioner_FLAGS DEPENDENCIES iostreams_component)
+
+foreach(example_program ${example_programs})
+  set(sources
+      ${example_program}.cpp)
+
+  source_group("Source Files" FILES ${sources})
+
+  # add example executable
+  add_hpx_executable(${example_program}
+                     SOURCES ${sources}
+                     ${${example_program}_FLAGS}
+                     FOLDER "Examples/ResourcePartitioner")
+
+  if(MSVC)
+    add_definitions(-D_USE_MATH_DEFINES)
+  endif()
+
+  # add a custom target for this example
+  add_hpx_pseudo_target(examples.resource_partitioner.${example_program})
+
+  # make pseudo-targets depend on master pseudo-target
+  add_hpx_pseudo_dependencies(examples.resource_partitioner
+                              examples.resource_partitioner.${example_program})
+
+  # add dependencies to pseudo-target
+  add_hpx_pseudo_dependencies(examples.resource_partitioner.${example_program}
+                              ${example_program}_exe)
+endforeach()
+