Merge pull request #1641 from STEllAR-GROUP/generic_client

Generic client
STEllAR-GROUP · Apr 4, 2016 · bbcc734 · bbcc734
2 parents dee2677 + 37a1349
commit bbcc734
Show file tree

Hide file tree

Showing 62 changed files with 1,750 additions and 611 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -999,6 +999,9 @@ if(HPX_WITH_COMPILER_WARNINGS)
     # has no meaning; ignored'
     hpx_add_compile_flag(-wd4180)
 
+    # max symbol length exceeded
+    hpx_add_compile_flag(-wd4503)
+
     # OpenMPI triggers a lot of forcing value to bool 'true' or 'false'
     # (performance warning)
     if(MPI_FOUND OR HPX_WITH_APEX)

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -177,9 +177,6 @@ set(doxygen_output_dir "${CMAKE_CURRENT_BINARY_DIR}/doxygen")
 
 set(doxygen_definition_list
     "DOXYGEN:=1"
-    "BOOST_SCOPED_ENUM_START(x):=enum x"
-    "BOOST_SCOPED_ENUM_END="
-    "BOOST_SCOPED_ENUM(x):=x"
     "BOOST_SYSTEM_NOEXCEPT="
     "HPX_EXCEPTION_EXPORT="
     "HPX_EXPORT="

diff --git a/examples/quickstart/non_atomic_rma.cpp b/examples/quickstart/non_atomic_rma.cpp
@@ -121,7 +121,7 @@ int hpx_main(po::variables_map &vm)
 
         for (int i=0;i<array_length;i++) {
           components::access_memory_block<data>
-                  result( components::stubs::memory_block::get(n[i].get()) );
+                  result( components::stubs::memory_block::get_data(n[i].get()) );
           std::cout << " Result index: " << i << " value : "
                   << result->val_ << std::endl;
         }

diff --git a/examples/quickstart/quicksort.cpp b/examples/quickstart/quicksort.cpp
@@ -103,7 +103,7 @@ void quicksort_parallel<T>::call(id_type prefix, id_type d, std::size_t begin,
     if (begin != end)
     {
         memory_block mb(d);
-        access_memory_block<T> data(mb.get());
+        access_memory_block<T> data(mb.get_data());
 
         std::size_t middle_idx = partition(data.get_ptr(), begin, end);
 
@@ -153,7 +153,7 @@ int hpx_main(variables_map& vm)
     {
         // create a (remote) memory block
         memory_block mb = memory_block::create<int, uint8_t>(prefix, elements);
-        access_memory_block<int> data(mb.get());
+        access_memory_block<int> data(mb.get_data());
 
         // randomly fill the vector
         std::generate(data.get_ptr(), data.get_ptr() + elements, std::rand);

diff --git a/hpx/async.hpp b/hpx/async.hpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2007-2013 Hartmut Kaiser
+//  Copyright (c) 2007-2015 Hartmut Kaiser
 //
 //  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)
@@ -103,7 +103,7 @@ namespace hpx { namespace detail
             traits::detail::is_deferred_callable<F(Ts&&...)>::value,
             hpx::future<typename util::detail::deferred_result_of<F(Ts&&...)>::type>
         >::type
-        call(launch launch_policy, F&& f, Ts&&... ts)
+        call(launch launch_policy, F && f, Ts&&... ts)
         {
             typedef typename util::detail::deferred_result_of<
                 F(Ts&&...)
@@ -221,8 +221,9 @@ namespace hpx
             std::forward<F>(f), std::forward<Ts>(ts)...
         ))
     {
-        return detail::async_dispatch<typename util::decay<F>::type>::call(
-            std::forward<F>(f), std::forward<Ts>(ts)...);
+        return detail::async_dispatch<
+                typename util::decay<F>::type
+            >::call(std::forward<F>(f), std::forward<Ts>(ts)...);
     }
 }
 

diff --git a/hpx/components/component_storage/component_storage.hpp b/hpx/components/component_storage/component_storage.hpp
@@ -25,6 +25,7 @@ namespace hpx { namespace components
 
     public:
         component_storage(hpx::id_type target_locality);
+        component_storage(hpx::future<naming::id_type> && f);
 
         hpx::future<naming::id_type> migrate_to_here(std::vector<char> const&,
             naming::id_type, naming::address const&);

diff --git a/hpx/components/component_storage/server/migrate_from_storage.hpp b/hpx/components/component_storage/server/migrate_from_storage.hpp
@@ -145,7 +145,7 @@ namespace hpx { namespace components { namespace server
             .then(
                 [to_resurrect, target_locality](
                     future<std::pair<naming::id_type, naming::address> > && f)
-                        -> future<naming::id_type>
+                ->  future<naming::id_type>
                 {
                     // rethrow errors
                     std::pair<naming::id_type, naming::address> r = f.get();

diff --git a/hpx/components/containers/partitioned_vector/partitioned_vector.hpp b/hpx/components/containers/partitioned_vector/partitioned_vector.hpp
@@ -131,7 +131,7 @@ namespace hpx
     ///
     template <typename T>
     class partitioned_vector
-      : hpx::components::client_base<partitioned_vector<T>,
+      : public hpx::components::client_base<partitioned_vector<T>,
             hpx::components::server::distributed_metadata_base<
                 server::partitioned_vector_config_data> >
     {
@@ -337,6 +337,15 @@ namespace hpx
             register_as(symbolic_name).get();
         }
 
+        // construct from id
+        partitioned_vector(future<id_type> && f)
+        {
+            using util::placeholders::_1;
+            f.share().then(
+                util::bind(&partitioned_vector::connect_to_helper, this, _1)
+            );
+        }
+
     public:
         // Return the sequence number of the segment corresponding to the
         // given global index

diff --git a/hpx/components/containers/partitioned_vector/partitioned_vector_component.hpp b/hpx/components/containers/partitioned_vector/partitioned_vector_component.hpp
@@ -481,6 +481,7 @@ namespace hpx
         typedef hpx::components::client_base<
                 partitioned_vector_partition<T>, server::partitioned_vector<T>
             > base_type;
+
     public:
         partitioned_vector_partition() {}
 

diff --git a/hpx/include/components.hpp b/hpx/include/components.hpp
@@ -30,6 +30,7 @@
 
 #include <hpx/runtime/components/stubs/runtime_support.hpp>
 #include <hpx/runtime/components/client_base.hpp>
+#include <hpx/runtime/components/client.hpp>
 
 #include <hpx/runtime/components/server/component.hpp>
 #include <hpx/runtime/components/server/component_base.hpp>