Add the futures in the execution module

The dependencies between futures and execution are very mixed up that's why we put the two together for now.
STEllAR-GROUP · Dec 9, 2019 · af7c370 · af7c370
1 parent 02b5817
commit af7c370
Show file tree

Hide file tree

Showing 242 changed files with 731 additions and 374 deletions.
diff --git a/components/component_storage/include/hpx/components/component_storage/component_storage.hpp b/components/component_storage/include/hpx/components/component_storage/component_storage.hpp
@@ -8,9 +8,9 @@
 #define HPX_COMPONENT_STORAGE_FEB_06_2015_0959AM
 
 #include <hpx/config.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/components/client_base.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/runtime/naming/address.hpp>
 #include <hpx/runtime/naming/id_type.hpp>
 #include <hpx/runtime/naming/name.hpp>

diff --git a/...nents/component_storage/include/hpx/components/component_storage/migrate_from_storage.hpp b/...nents/component_storage/include/hpx/components/component_storage/migrate_from_storage.hpp
@@ -10,7 +10,7 @@
 #define HPX_MIGRATE_FROM_STORAGE_FEB_09_2015_0329PM
 
 #include <hpx/config.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/naming/id_type.hpp>
 #include <hpx/traits/is_component.hpp>
 

diff --git a/components/component_storage/include/hpx/components/component_storage/migrate_to_storage.hpp b/components/component_storage/include/hpx/components/component_storage/migrate_to_storage.hpp
@@ -10,7 +10,7 @@
 #define HPX_MIGRATE_TO_STORAGE_FEB_04_2015_1245PM
 
 #include <hpx/config.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/components/client_base.hpp>
 #include <hpx/runtime/naming/id_type.hpp>
 #include <hpx/traits/is_component.hpp>

diff --git a/...ioned_vector/include/hpx/components/containers/partitioned_vector/detail/view_element.hpp b/...ioned_vector/include/hpx/components/containers/partitioned_vector/detail/view_element.hpp
@@ -14,7 +14,7 @@
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_segmented_iterator.hpp>
 #include <hpx/runtime/get_locality_id.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/runtime/naming/name.hpp>
 
 #include <utility>

diff --git a/...nclude/hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp b/...nclude/hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp
@@ -24,7 +24,7 @@
 #include <hpx/runtime/components/client_base.hpp>
 #include <hpx/runtime/components/server/component_base.hpp>
 #include <hpx/runtime/components/server/locking_hook.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_fwd.hpp>
 

diff --git a/...nclude/hpx/components/containers/partitioned_vector/partitioned_vector_component_impl.hpp b/...nclude/hpx/components/containers/partitioned_vector/partitioned_vector_component_impl.hpp
@@ -19,7 +19,7 @@
 #include <hpx/runtime/components/server/component_base.hpp>
 #include <hpx/runtime/components/server/locking_hook.hpp>
 #include <hpx/runtime/get_ptr.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_decl.hpp>
 

diff --git a/...d_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_decl.hpp b/...d_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_decl.hpp
@@ -19,7 +19,7 @@
 #include <hpx/runtime/components/new.hpp>
 #include <hpx/runtime/components/server/distributed_metadata_base.hpp>
 #include <hpx/runtime/get_ptr.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/errors.hpp>
 #include <hpx/traits/is_distribution_policy.hpp>
 #include <hpx/functional/bind.hpp>

diff --git a/...d_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_impl.hpp b/...d_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_impl.hpp
@@ -18,7 +18,7 @@
 #include <hpx/runtime/components/new.hpp>
 #include <hpx/runtime/components/server/distributed_metadata_base.hpp>
 #include <hpx/runtime/get_ptr.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/errors.hpp>
 #include <hpx/traits/is_distribution_policy.hpp>
 #include <hpx/functional/bind_back.hpp>

diff --git a/...de/hpx/components/containers/partitioned_vector/partitioned_vector_segmented_iterator.hpp b/...de/hpx/components/containers/partitioned_vector/partitioned_vector_segmented_iterator.hpp
@@ -16,7 +16,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/assertion.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/runtime/naming/id_type.hpp>
 #include <hpx/traits/is_value_proxy.hpp>
 #include <hpx/traits/segmented_iterator_traits.hpp>

diff --git a/...d_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_view.hpp b/...d_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_view.hpp
@@ -15,7 +15,7 @@
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_segmented_iterator.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_view_iterator.hpp>
 #include <hpx/datastructures/detail/pack.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 
 #include <array>
 #include <cstddef>

diff --git a/...ordered/include/hpx/components/containers/unordered/partition_unordered_map_component.hpp b/...ordered/include/hpx/components/containers/unordered/partition_unordered_map_component.hpp
@@ -31,7 +31,7 @@
 #include <hpx/runtime/components/server/locking_hook.hpp>
 #include <hpx/runtime/components/server/simple_component_base.hpp>
 #include <hpx/runtime/get_ptr.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/errors.hpp>
 
 #include <cstddef>

diff --git a/components/process/include/hpx/components/process/child.hpp b/components/process/include/hpx/components/process/child.hpp
@@ -9,9 +9,9 @@
 
 #include <hpx/config.hpp>
 #include <hpx/async.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/components/client_base.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 
 #include <hpx/components/process/server/child.hpp>
 

diff --git a/examples/heartbeat/heartbeat.cpp b/examples/heartbeat/heartbeat.cpp
@@ -13,7 +13,7 @@
 #include <hpx/include/lcos.hpp>
 #include <hpx/runtime/actions/plain_action.hpp>
 #include <hpx/runtime/threads/thread_helpers.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/state.hpp>
 #include <hpx/format.hpp>
 #include <hpx/timing.hpp>

diff --git a/examples/sheneos/sheneos/partition3d.hpp b/examples/sheneos/sheneos/partition3d.hpp
@@ -8,7 +8,7 @@
 #define HPX_SHENEOS_PARTITION3D_AUG_08_2011_1223PM
 
 #include <hpx/hpx.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/include/client.hpp>
 
 #include <cstdint>

diff --git a/examples/throttle/throttle/server/throttle.hpp b/examples/throttle/throttle/server/throttle.hpp
@@ -9,7 +9,7 @@
 
 #include <hpx/hpx.hpp>
 #include <hpx/include/components.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/synchronization/mutex.hpp>
 #include <hpx/runtime/actions/component_action.hpp>
 

diff --git a/examples/throttle/throttle/stubs/throttle.hpp b/examples/throttle/throttle/stubs/throttle.hpp
@@ -8,7 +8,7 @@
 #define HPX_THROTTLE_STUBS_AUG_09_2011_0703PM
 
 #include <hpx/hpx.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/components/stubs/stub_base.hpp>
 
 #include "../server/throttle.hpp"

diff --git a/examples/throttle/throttle/throttle.hpp b/examples/throttle/throttle/throttle.hpp
@@ -8,7 +8,7 @@
 #define HPX_THROTTLE_AUG_09_2011_0659PM
 
 #include <hpx/hpx.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/actions/continuation.hpp>
 #include <hpx/include/client.hpp>
 

diff --git a/hpx/apply.hpp b/hpx/apply.hpp
@@ -14,7 +14,7 @@
 #include <hpx/runtime/threads/thread_helpers.hpp>
 #include <hpx/runtime_fwd.hpp>
 #include <hpx/execution/traits/is_executor.hpp>
-#include <hpx/traits/is_launch_policy.hpp>
+#include <hpx/execution/traits/is_launch_policy.hpp>
 #include <hpx/util/bind_action.hpp>
 #include <hpx/type_support/decay.hpp>
 #include <hpx/functional/deferred_call.hpp>

diff --git a/hpx/async.hpp b/hpx/async.hpp
@@ -11,13 +11,13 @@
 #include <hpx/async_launch_policy_dispatch.hpp>
 #include <hpx/lcos/async.hpp>
 #include <hpx/lcos/async_continue.hpp>
-#include <hpx/lcos/future.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/future.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/runtime/threads/thread.hpp>
 #include <hpx/runtime_fwd.hpp>
 #include <hpx/functional/traits/is_action.hpp>
 #include <hpx/execution/traits/is_executor.hpp>
-#include <hpx/traits/is_launch_policy.hpp>
+#include <hpx/execution/traits/is_launch_policy.hpp>
 #include <hpx/util/bind_action.hpp>
 #include <hpx/functional/deferred_call.hpp>
 

diff --git a/hpx/async_launch_policy_dispatch.hpp b/hpx/async_launch_policy_dispatch.hpp
@@ -14,9 +14,9 @@
 #include <hpx/functional/invoke.hpp>
 #include <hpx/functional/traits/is_action.hpp>
 #include <hpx/lcos/async_fwd.hpp>
-#include <hpx/lcos/future.hpp>
-#include <hpx/lcos/local/futures_factory.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/future.hpp>
+#include <hpx/execution/futures_factory.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/runtime/threads/thread_data_fwd.hpp>
 #include <hpx/runtime/threads/thread_helpers.hpp>
 #include <hpx/runtime/threads/thread_pool_base.hpp>

diff --git a/hpx/dataflow.hpp b/hpx/dataflow.hpp
@@ -7,7 +7,7 @@
 #ifndef HPX_DATAFLOW_HPP
 #define HPX_DATAFLOW_HPP
 
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/lcos/dataflow.hpp>
 
 #endif /*HPX_DATAFLOW_HPP*/
diff --git a/hpx/include/future.hpp b/hpx/include/future.hpp
@@ -7,7 +7,7 @@
 #if !defined(HPX_FUTURE_APR_17_2012_0840AM)
 #define HPX_FUTURE_APR_17_2012_0840AM
 
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 
 #endif
 
diff --git a/hpx/include/lcos.hpp b/hpx/include/lcos.hpp
@@ -25,7 +25,7 @@
 #include <hpx/include/async.hpp>
 #include <hpx/include/dataflow.hpp>
 #include <hpx/include/local_lcos.hpp>
-#include <hpx/lcos/split_future.hpp>
+#include <hpx/execution/split_future.hpp>
 #include <hpx/lcos/wait_all.hpp>
 #include <hpx/lcos/wait_any.hpp>
 #include <hpx/lcos/wait_each.hpp>

diff --git a/hpx/include/local_lcos.hpp b/hpx/include/local_lcos.hpp
@@ -15,7 +15,7 @@
 
 #include <hpx/synchronization.hpp>
 
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/local_lcos/and_gate.hpp>
 #include <hpx/lcos/local/packaged_continuation.hpp>
 #include <hpx/local_lcos/packaged_task.hpp>

diff --git a/hpx/include/traits.hpp b/hpx/include/traits.hpp
@@ -26,8 +26,8 @@
 #include <hpx/serialization/traits/needs_automatic_registration.hpp>
 #include <hpx/serialization/traits/polymorphic_traits.hpp>
 #include <hpx/serialization/traits/serialization_access_data.hpp>
-#include <hpx/traits/acquire_future.hpp>
-#include <hpx/traits/acquire_shared_state.hpp>
+#include <hpx/execution/traits/acquire_future.hpp>
+#include <hpx/execution/traits/acquire_shared_state.hpp>
 #include <hpx/traits/action_decorate_continuation.hpp>
 #include <hpx/traits/action_decorate_function.hpp>
 #include <hpx/traits/action_does_termination_detection.hpp>
@@ -47,19 +47,19 @@
 #include <hpx/traits/component_type_database.hpp>
 #include <hpx/traits/component_type_is_compatible.hpp>
 #include <hpx/traits/extract_action.hpp>
-#include <hpx/traits/future_access.hpp>
-#include <hpx/traits/future_traits.hpp>
+#include <hpx/execution/traits/future_access.hpp>
+#include <hpx/execution/traits/future_traits.hpp>
 #include <hpx/traits/get_remote_result.hpp>
 #include <hpx/traits/is_client.hpp>
 #include <hpx/traits/is_component.hpp>
 #include <hpx/traits/is_continuation.hpp>
 #include <hpx/traits/is_distribution_policy.hpp>
 #include <hpx/execution/traits/is_executor.hpp>
 #include <hpx/execution/traits/is_executor_parameters.hpp>
-#include <hpx/traits/is_future.hpp>
-#include <hpx/traits/is_future_range.hpp>
+#include <hpx/execution/traits/is_future.hpp>
+#include <hpx/execution/traits/is_future_range.hpp>
 #include <hpx/traits/is_future_tuple.hpp>
-#include <hpx/traits/is_launch_policy.hpp>
+#include <hpx/execution/traits/is_launch_policy.hpp>
 #include <hpx/execution/traits/is_timed_executor.hpp>
 #include <hpx/traits/is_valid_action.hpp>
 #include <hpx/traits/managed_component_policies.hpp>

diff --git a/hpx/lcos/async.hpp b/hpx/lcos/async.hpp
@@ -12,15 +12,15 @@
 #include <hpx/functional/bind_back.hpp>
 #include <hpx/lcos/async_fwd.hpp>
 #include <hpx/lcos/detail/async_implementations.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/components/client_base.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/runtime/naming/id_type.hpp>
 #include <hpx/traits/extract_action.hpp>
 #include <hpx/functional/traits/is_action.hpp>
 #include <hpx/traits/is_client.hpp>
 #include <hpx/traits/is_distribution_policy.hpp>
-#include <hpx/traits/is_launch_policy.hpp>
+#include <hpx/execution/traits/is_launch_policy.hpp>
 #include <hpx/traits/is_valid_action.hpp>
 #include <hpx/traits/promise_local_result.hpp>
 #include <hpx/type_support/lazy_enable_if.hpp>

diff --git a/hpx/lcos/async_callback.hpp b/hpx/lcos/async_callback.hpp
@@ -10,9 +10,9 @@
 #include <hpx/config.hpp>
 #include <hpx/lcos/async_callback_fwd.hpp>
 #include <hpx/lcos/detail/async_implementations_fwd.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/components/client_base.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/traits/extract_action.hpp>
 #include <hpx/functional/traits/is_action.hpp>
 #include <hpx/traits/is_client.hpp>

diff --git a/hpx/lcos/async_callback_fwd.hpp b/hpx/lcos/async_callback_fwd.hpp
@@ -9,9 +9,9 @@
 
 #include <hpx/config.hpp>
 #include <hpx/lcos/async_fwd.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/actions/basic_action_fwd.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/runtime/naming/id_type.hpp>
 
 #include <utility>

diff --git a/hpx/lcos/async_continue.hpp b/hpx/lcos/async_continue.hpp
@@ -12,7 +12,7 @@
 #include <hpx/config.hpp>
 #include <hpx/lcos/async_continue_fwd.hpp>
 #include <hpx/lcos/async_fwd.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/lcos/packaged_action.hpp>
 #include <hpx/runtime/actions/action_support.hpp>
 #include <hpx/traits/extract_action.hpp>

diff --git a/hpx/lcos/async_continue_fwd.hpp b/hpx/lcos/async_continue_fwd.hpp
@@ -11,7 +11,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/functional/result_of.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/traits/action_remote_result.hpp>
 #include <hpx/traits/extract_action.hpp>
 #include <hpx/traits/is_distribution_policy.hpp>

diff --git a/hpx/lcos/channel.hpp b/hpx/lcos/channel.hpp
@@ -10,11 +10,11 @@
 #include <hpx/config.hpp>
 #include <hpx/apply.hpp>
 #include <hpx/assertion.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/lcos/server/channel.hpp>
 #include <hpx/runtime/components/client_base.hpp>
 #include <hpx/runtime/components/new.hpp>
-#include <hpx/runtime/launch_policy.hpp>
+#include <hpx/execution/launch_policy.hpp>
 #include <hpx/runtime/naming_fwd.hpp>
 
 #include <cstddef>

diff --git a/hpx/lcos/dataflow.hpp b/hpx/lcos/dataflow.hpp
@@ -17,7 +17,7 @@
 
 // Intentionally #include future.hpp outside of the guards as it may #include
 // dataflow.hpp itself
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 
 #ifndef HPX_LCOS_DATAFLOW_HPP
 #define HPX_LCOS_DATAFLOW_HPP
@@ -31,13 +31,13 @@
 #include <hpx/lcos/detail/future_transforms.hpp>
 #include <hpx/memory/intrusive_ptr.hpp>
 #include <hpx/runtime/get_worker_thread_num.hpp>
-#include <hpx/runtime/launch_policy.hpp>
-#include <hpx/traits/acquire_future.hpp>
+#include <hpx/execution/launch_policy.hpp>
+#include <hpx/execution/traits/acquire_future.hpp>
 #include <hpx/traits/extract_action.hpp>
-#include <hpx/traits/future_access.hpp>
+#include <hpx/execution/traits/future_access.hpp>
 #include <hpx/execution/traits/is_executor.hpp>
-#include <hpx/traits/is_future.hpp>
-#include <hpx/traits/is_launch_policy.hpp>
+#include <hpx/execution/traits/is_future.hpp>
+#include <hpx/execution/traits/is_launch_policy.hpp>
 #include <hpx/traits/promise_local_result.hpp>
 #include <hpx/type_support/always_void.hpp>
 #include <hpx/util/annotated_function.hpp>

diff --git a/hpx/lcos/detail/async_colocated.hpp b/hpx/lcos/detail/async_colocated.hpp
@@ -12,7 +12,7 @@
 #include <hpx/lcos/async_continue_fwd.hpp>
 #include <hpx/lcos/async_fwd.hpp>
 #include <hpx/lcos/detail/async_colocated_fwd.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/actions/action_support.hpp>
 #include <hpx/runtime/agas/primary_namespace.hpp>
 #include <hpx/runtime/agas/server/primary_namespace.hpp>

diff --git a/hpx/lcos/detail/async_colocated_fwd.hpp b/hpx/lcos/detail/async_colocated_fwd.hpp
@@ -9,7 +9,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/lcos/async_fwd.hpp>
-#include <hpx/lcos/future.hpp>
+#include <hpx/execution/future.hpp>
 #include <hpx/runtime/actions/basic_action_fwd.hpp>
 #include <hpx/runtime/naming/name.hpp>
 #include <hpx/traits/extract_action.hpp>