Allowing for LCOs to be simple components

- flyby: refactored all HPX_REGISTER_BASE_LCO* macros - flyby: pass through component type to all thread execution functions
STEllAR-GROUP · Jul 11, 2017 · ae34321 · ae34321
1 parent c3d8bdf
commit ae34321
Show file tree

Hide file tree

Showing 29 changed files with 576 additions and 263 deletions.
diff --git a/examples/quickstart/data_actions.cpp b/examples/quickstart/data_actions.cpp
@@ -48,7 +48,8 @@ struct data_get_action
 
     // Return the referenced data
     static data_type invoke(
-        hpx::naming::address::address_type /*lva*/)
+        hpx::naming::address::address_type /*lva*/,
+        naming::address::component_type /*comptype*/)
     {
         return *Data;
     }
@@ -75,7 +76,9 @@ struct data_set_action
 
     // Return the referenced data
     static void invoke(
-        hpx::naming::address::address_type /*lva*/, data_type const& data)
+        hpx::naming::address::address_type /*lva*/,
+        naming::address::component_type /*comptype*/,
+        data_type const& data)
     {
         *Data = data;
     }

diff --git a/hpx/lcos/base_lco_with_value.hpp b/hpx/lcos/base_lco_with_value.hpp
diff --git a/hpx/lcos/detail/async_implementations.hpp b/hpx/lcos/detail/async_implementations.hpp
@@ -120,7 +120,7 @@ namespace hpx { namespace detail
                     typename Action::component_type
                 >::call(addr));
 
-            return Action::execute_function(addr.address_,
+            return Action::execute_function(addr.address_, addr.type_,
                 std::forward<Ts>(vs)...);
         }
     };
@@ -162,7 +162,7 @@ namespace hpx { namespace detail
                 >::call(addr));
 
             lcos::future<Result> f = Action::execute_function(
-                addr.address_, std::forward<Ts>(vs)...);
+                addr.address_, addr.type_, std::forward<Ts>(vs)...);
 
             // invoke callback
             cb(boost::system::error_code(), parcelset::parcel());

diff --git a/hpx/lcos/detail/promise_lco.hpp b/hpx/lcos/detail/promise_lco.hpp
@@ -203,7 +203,7 @@ namespace traits {
             if (value == components::component_invalid)
             {
                 value = derived_component_type(++detail::unique_type,
-                    components::component_base_lco_with_value);
+                    components::component_base_lco_with_value_managed);
             }
             return value;
         }

diff --git a/hpx/lcos/packaged_action.hpp b/hpx/lcos/packaged_action.hpp
@@ -383,8 +383,7 @@ namespace lcos {
                     traits::component_type_is_compatible<component_type>::call(
                         addr));
 
-                if (traits::component_supports_migration<
-                        component_type>::call())
+                if (traits::component_supports_migration<component_type>::call())
                 {
                     r = traits::action_was_object_migrated<Action>::call(
                         id, addr.address_);
@@ -393,15 +392,18 @@ namespace lcos {
                         // local, direct execution
                         this->shared_state_->set_data(
                             action_type::execute_function(
-                                addr.address_, std::forward<Ts>(vs)...));
+                                addr.address_, addr.type_,
+                                std::forward<Ts>(vs)...));
                         return;
                     }
                 }
                 else
                 {
                     // local, direct execution
-                    this->shared_state_->set_data(action_type::execute_function(
-                        addr.address_, std::forward<Ts>(vs)...));
+                    this->shared_state_->set_data(
+                        action_type::execute_function(
+                            addr.address_, addr.type_,
+                            std::forward<Ts>(vs)...));
                     return;
                 }
             }
@@ -434,15 +436,18 @@ namespace lcos {
                         // local, direct execution
                         this->shared_state_->set_data(
                             action_type::execute_function(
-                                addr.address_, std::forward<Ts>(vs)...));
+                                addr.address_, addr.type_,
+                                std::forward<Ts>(vs)...));
                         return;
                     }
                 }
                 else
                 {
                     // local, direct execution
-                    this->shared_state_->set_data(action_type::execute_function(
-                        addr.address_, std::forward<Ts>(vs)...));
+                    this->shared_state_->set_data(
+                        action_type::execute_function(
+                            addr.address_, addr.type_,
+                            std::forward<Ts>(vs)...));
                     return;
                 }
             }
@@ -476,7 +481,8 @@ namespace lcos {
                         // local, direct execution
                         this->shared_state_->set_data(
                             action_type::execute_function(
-                                addr.address_, std::forward<Ts>(vs)...));
+                                addr.address_, addr.type_,
+                                std::forward<Ts>(vs)...));
 
                         // invoke callback
                         cb(boost::system::error_code(), parcelset::parcel());
@@ -486,8 +492,10 @@ namespace lcos {
                 else
                 {
                     // local, direct execution
-                    this->shared_state_->set_data(action_type::execute_function(
-                        addr.address_, std::forward<Ts>(vs)...));
+                    this->shared_state_->set_data(
+                        action_type::execute_function(
+                            addr.address_, addr.type_,
+                            std::forward<Ts>(vs)...));
 
                     // invoke callback
                     cb(boost::system::error_code(), parcelset::parcel());
@@ -523,7 +531,8 @@ namespace lcos {
                         // local, direct execution
                         this->shared_state_->set_data(
                             action_type::execute_function(
-                                addr.address_, std::forward<Ts>(vs)...));
+                                addr.address_, addr.type_,
+                                std::forward<Ts>(vs)...));
 
                         // invoke callback
                         cb(boost::system::error_code(), parcelset::parcel());
@@ -533,8 +542,10 @@ namespace lcos {
                 else
                 {
                     // local, direct execution
-                    this->shared_state_->set_data(action_type::execute_function(
-                        addr.address_, std::forward<Ts>(vs)...));
+                    this->shared_state_->set_data(
+                        action_type::execute_function(
+                            addr.address_, addr.type_,
+                            std::forward<Ts>(vs)...));
 
                     // invoke callback
                     cb(boost::system::error_code(), parcelset::parcel());

diff --git a/hpx/lcos/server/latch.hpp b/hpx/lcos/server/latch.hpp
@@ -134,7 +134,7 @@ HPX_REGISTER_ACTION_DECLARATION(
     hpx::lcos::server::latch::wait_action,
     hpx_lcos_server_latch_wait_action)
 
-HPX_REGISTER_BASE_LCO_WITH_VALUE_DECLARATION2(
+HPX_REGISTER_BASE_LCO_WITH_VALUE_DECLARATION(
     bool, std::ptrdiff_t, bool_std_ptrdiff);
 
 #endif

diff --git a/hpx/lcos_fwd.hpp b/hpx/lcos_fwd.hpp
@@ -8,6 +8,7 @@
 #define HPX_LCOS_FWD_HPP
 
 #include <hpx/config.hpp>
+#include <hpx/traits/is_component.hpp>
 #include <hpx/traits/promise_local_result.hpp>
 #include <hpx/traits/promise_remote_result.hpp>
 
@@ -26,11 +27,12 @@ namespace hpx
         class HPX_EXPORT base_lco;
 
         template <typename Result, typename RemoteResult =
-            typename traits::promise_remote_result<Result>::type>
+            typename traits::promise_remote_result<Result>::type,
+            typename ComponentType = traits::detail::managed_component_tag>
         class base_lco_with_value;
 
-        template <>
-        class base_lco_with_value<void, void>;
+        template <typename ComponentType>
+        class base_lco_with_value<void, void, ComponentType>;
 
         template <typename Result, typename RemoteResult =
             typename traits::promise_remote_result<Result>::type>

diff --git a/hpx/runtime/actions/base_action.hpp b/hpx/runtime/actions/base_action.hpp
@@ -74,7 +74,8 @@ namespace hpx { namespace actions
         ///               for a \a thread.
         virtual threads::thread_function_type
             get_thread_function(naming::id_type&& target,
-                naming::address_type lva) = 0;
+                naming::address_type lva,
+                naming::address::component_type comptype) = 0;
 
         /// return the id of the locality of the parent thread
         virtual std::uint32_t get_parent_locality_id() const = 0;
@@ -96,7 +97,7 @@ namespace hpx { namespace actions
 
         /// Perform thread initialization
         virtual void schedule_thread(naming::gid_type const& target,
-            naming::address_type lva,
+            naming::address_type lva, naming::component_type comptype,
             std::size_t num_thread) = 0;
 
         /// Return whether the given object was migrated
@@ -119,7 +120,8 @@ namespace hpx { namespace actions
 
         virtual void load_schedule(serialization::input_archive& ar,
             naming::gid_type&& target, naming::address_type lva,
-            std::size_t num_thread, bool& deferred_schedule) = 0;
+            naming::component_type comptype, std::size_t num_thread,
+            bool& deferred_schedule) = 0;
 
         /// The function \a get_serialization_id returns the id which has been
         /// associated with this action (mainly used for serialization purposes).