add some changes

weilewei · Mar 21, 2019 · 99914ba · 99914ba
1 parent a6ce119
commit 99914ba
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/src/dist_objects_4/src/server/template_dist_object.hpp b/src/dist_objects_4/src/server/template_dist_object.hpp
@@ -1,5 +1,5 @@
 //  Copyright (c) 2019 Weile Wei
-//  Copyright (c) Maxwell Resser
+//  Copyright (c) 2019 Maxwell Resser
 //  Copyright (c) 2019 Hartmut Kaiser
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -43,7 +43,17 @@ namespace dist_object {
 				return &data_;
 			}
 
+			hpx::future<data_type> fetch()
+			{
+				HPX_ASSERT(this->get_id());
+
+				typedef typename server::partition<T>::fetch_action
+					action_type;
+				return hpx::async<action_type>(this->get_id());
+			}
+
 			HPX_DEFINE_COMPONENT_ACTION(partition, size);
+			HPX_DEFINE_COMPONENT_ACTION(partition, fetch);
 
 		private:
 			data_type data_;
@@ -55,13 +65,19 @@ namespace dist_object {
   HPX_REGISTER_ACTION_DECLARATION(                                             \
                                                                                \
   HPX_REGISTER_ACTION_DECLARATION(                                             \
-      dist_object::server::partition<type>::size_action,                     \
+      dist_object::server::partition<type>::size_action,                       \
       HPX_PP_CAT(__partition_size_action_, type));                             \
+  HPX_REGISTER_ACTION_DECLARATION(                                             \
+      dist_object::server::partition<type>::fetch_action,                      \
+      HPX_PP_CAT(__partition_fetch_action_, type));                            \
   /**/
 
 #define REGISTER_PARTITION(type)                                               \
   HPX_REGISTER_ACTION(dist_object::server::partition<type>::size_action,       \
                       HPX_PP_CAT(__partition_size_action_, type));             \
+  HPX_REGISTER_ACTION(                                                         \
+      dist_object::server::partition<type>::fetch_action,                      \
+      HPX_PP_CAT(__partition_fetch_action_, type));                            \
   typedef ::hpx::components::component<dist_object::server::partition<type>>   \
       HPX_PP_CAT(__partition_, type);                                          \
   HPX_REGISTER_COMPONENT(HPX_PP_CAT(__partition_, type))                       \

diff --git a/src/dist_objects_4/src/template_dist_object.cpp b/src/dist_objects_4/src/template_dist_object.cpp
@@ -1,5 +1,5 @@
 //  Copyright (c) 2019 Weile Wei
-//  Copyright (c) Maxwell Resser
+//  Copyright (c) 2019 Maxwell Resser
 //  Copyright (c) 2019 Hartmut Kaiser
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying

diff --git a/src/dist_objects_4/src/template_dist_object.hpp b/src/dist_objects_4/src/template_dist_object.hpp
@@ -1,5 +1,5 @@
 //  Copyright (c) 2019 Weile Wei
-//  Copyright (c) Maxwell Resser
+//  Copyright (c) 2019 Maxwell Resser
 //  Copyright (c) 2019 Hartmut Kaiser
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -42,9 +42,7 @@ namespace dist_object {
 
 		dist_object(hpx::future<hpx::id_type> &&id) : base_type(std::move(id)) {}
 
-		dist_object(hpx::id_type &&id) : base_type(std::move(id)) {}
-
-		~dist_object();
+		dist_object(hpx::id_type &&id) : base_type(std::move(id)) {}
 		size_t size() {
 			HPX_ASSERT(this->get_id());
 			ensure_ptr();
@@ -77,6 +75,15 @@ namespace dist_object {
 			return &**ptr;
 		}
 
+		hpx::future<data_type> fetch()
+		{
+			HPX_ASSERT(this->get_id());
+
+			typedef typename server::partition<T>::fetch_action
+				action_type;
+			return hpx::async<action_type>(this->get_id());
+		}
+
 	private:
 		mutable std::shared_ptr<server::partition<T>> ptr;
 		void ensure_ptr() const {

diff --git a/src/dist_objects_4/src/template_dist_object_client.cpp b/src/dist_objects_4/src/template_dist_object_client.cpp
@@ -1,5 +1,5 @@
 //  Copyright (c) 2019 Weile Wei
-//  Copyright (c) Maxwell Resser
+//  Copyright (c) 2019 Maxwell Resser
 //  Copyright (c) 2019 Hartmut Kaiser
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying