Merge pull request #2076 from STEllAR-GROUP/coalescing

Moving coalescing registration to TUs
STEllAR-GROUP · Apr 8, 2016 · b258953 · b258953
2 parents beb8772 + efbefb8
commit b258953
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 29 deletions.
diff --git a/hpx/components/iostreams/write_functions.hpp b/hpx/components/iostreams/write_functions.hpp
@@ -12,11 +12,12 @@
 #include <hpx/util/bind.hpp>
 #include <hpx/util/function.hpp>
 
-#include <ostream>
-#include <iterator>
 #include <algorithm>
 #include <deque>
+#include <iterator>
+#include <ostream>
 #include <type_traits>
+#include <vector>
 
 namespace hpx { namespace iostreams
 {

diff --git a/hpx/lcos/base_lco.hpp b/hpx/lcos/base_lco.hpp
@@ -14,10 +14,6 @@
 #include <hpx/runtime/actions/component_action.hpp>
 #include <hpx/util/ini.hpp>
 
-#include <hpx/plugins/parcel/coalescing_message_handler_registration.hpp>
-
-#include <boost/mpl/bool.hpp>
-
 namespace hpx { namespace lcos
 {
     /// The \a base_lco class is the common base class for all LCO's
@@ -124,12 +120,4 @@ HPX_REGISTER_ACTION_DECLARATION(
 HPX_REGISTER_ACTION_DECLARATION(
     hpx::lcos::base_lco::disconnect_action, base_disconnect_action)
 
-///////////////////////////////////////////////////////////////////////////////
-HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW(
-    hpx::lcos::base_lco::set_event_action, "lco_set_value_action",
-    std::size_t(-1), std::size_t(-1))
-HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW(
-    hpx::lcos::base_lco::set_exception_action, "lco_set_value_action",
-    std::size_t(-1), std::size_t(-1))
-
 #endif
diff --git a/hpx/lcos/base_lco_with_value.hpp b/hpx/lcos/base_lco_with_value.hpp
@@ -18,10 +18,11 @@
 #include <hpx/util/unused.hpp>
 #include <hpx/util/void_guard.hpp>
 
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/if.hpp>
+#include <hpx/plugins/parcel/coalescing_message_handler_registration.hpp>
+
 #include <boost/preprocessor/cat.hpp>
-#include <boost/type_traits/is_same.hpp>
+
+#include <type_traits>
 
 namespace hpx { namespace lcos
 {
@@ -35,8 +36,8 @@ namespace hpx { namespace lcos
     template <typename Result, typename RemoteResult>
     class base_lco_with_value : public base_lco
     {
-        typedef typename boost::mpl::if_<
-            boost::is_same<void, Result>, util::unused_type, Result
+        typedef typename std::conditional<
+            std::is_void<Result>::value, util::unused_type, Result
         >::type result_type;
 
     protected:
@@ -162,9 +163,6 @@ namespace hpx { namespace traits
     HPX_REGISTER_TYPED_CONTINUATION_DECLARATION(                                \
         Value                                                                   \
       , BOOST_PP_CAT(typed_continuation_, Name))                                \
-    HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW(                                 \
-        hpx::lcos::base_lco_with_value<Value>::set_value_action,                \
-        "lco_set_value_action", std::size_t(-1), std::size_t(-1))               \
 /**/
 
 #define HPX_REGISTER_BASE_LCO_WITH_VALUE(Value, Name)                           \
@@ -177,6 +175,9 @@ namespace hpx { namespace traits
     HPX_REGISTER_TYPED_CONTINUATION(                                            \
         Value                                                                   \
       , BOOST_PP_CAT(typed_continuation_, Name))                                \
+    HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW(                                 \
+        hpx::lcos::base_lco_with_value<Value>::set_value_action,                \
+        "lco_set_value_action", std::size_t(-1), std::size_t(-1))               \
 /**/
 
 #define HPX_REGISTER_BASE_LCO_WITH_VALUE_ID(                                    \

diff --git a/hpx/parallel/segmented_algorithms/count.hpp b/hpx/parallel/segmented_algorithms/count.hpp
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <numeric>
 #include <type_traits>
 #include <list>
 

diff --git a/hpx/plugins/parcel/coalescing_message_handler_registration.hpp b/hpx/plugins/parcel/coalescing_message_handler_registration.hpp
@@ -47,8 +47,8 @@ namespace hpx { namespace parcelset
 #define HPX_REGISTER_COALESCING_COUNTERS(Action, coalescing_name)             \
     namespace hpx { namespace parcelset                                       \
     {                                                                         \
-        template<>                                                            \
-        inline char const* get_action_coalescing_name<Action>()               \
+        template<> HPX_ALWAYS_EXPORT                                          \
+        char const* get_action_coalescing_name<Action>()                      \
         {                                                                     \
             return coalescing_name;                                           \
         }                                                                     \

diff --git a/hpx/util/ini.hpp b/hpx/util/ini.hpp
@@ -8,13 +8,14 @@
 #if !defined(HPX_UTIL_SECTION_SEP_17_2008_022PM)
 #define HPX_UTIL_SECTION_SEP_17_2008_022PM
 
-#include <map>
-#include <iostream>
-
 #include <hpx/runtime/serialization/serialization_fwd.hpp>
 
 #include <boost/lexical_cast.hpp>
 
+#include <iostream>
+#include <map>
+#include <vector>
+
 // suppress warnings about dependent classes not being exported from the dll
 #if defined(HPX_MSVC)
 #pragma warning(push)

diff --git a/src/lcos/base_lco.cpp b/src/lcos/base_lco.cpp
@@ -4,7 +4,7 @@
 //  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)
 
-#include <hpx/hpx_fwd.hpp>
+#include <hpx/config.hpp>
 #include <hpx/runtime/applier/applier.hpp>
 #include <hpx/runtime/components/component_factory.hpp>
 #include <hpx/runtime/components/derived_component_factory.hpp>
@@ -13,6 +13,8 @@
 #include <hpx/util/ini.hpp>
 #include <hpx/util/serialize_exception.hpp>
 
+#include <hpx/plugins/parcel/coalescing_message_handler_registration.hpp>
+
 namespace hpx { namespace lcos
 {
     void base_lco::set_exception(boost::exception_ptr const& e)
@@ -73,6 +75,14 @@ HPX_REGISTER_ACTION_ID(hpx::lcos::base_lco::connect_action,
 HPX_REGISTER_ACTION_ID(hpx::lcos::base_lco::disconnect_action,
     base_disconnect_action, hpx::actions::base_disconnect_action_id)
 
+///////////////////////////////////////////////////////////////////////////////
+HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW(
+    hpx::lcos::base_lco::set_event_action, "lco_set_value_action",
+    std::size_t(-1), std::size_t(-1))
+HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW(
+    hpx::lcos::base_lco::set_exception_action, "lco_set_value_action",
+    std::size_t(-1), std::size_t(-1))
+
 ///////////////////////////////////////////////////////////////////////////////
 HPX_DEFINE_GET_COMPONENT_TYPE_STATIC(
     hpx::lcos::base_lco, hpx::components::component_base_lco)

diff --git a/src/runtime/parcelset/parcelhandler.cpp b/src/runtime/parcelset/parcelhandler.cpp
@@ -6,7 +6,7 @@
 //  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)
 
-#include <hpx/hpx_fwd.hpp>
+#include <hpx/config.hpp>
 #include <hpx/state.hpp>
 #include <hpx/exception.hpp>
 #include <hpx/config/asio.hpp>
@@ -18,6 +18,7 @@
 #include <hpx/runtime/naming/resolver_client.hpp>
 #include <hpx/runtime/parcelset/parcelhandler.hpp>
 #include <hpx/runtime/parcelset/static_parcelports.hpp>
+#include <hpx/runtime/parcelset/policies/message_handler.hpp>
 #include <hpx/runtime/threads/threadmanager.hpp>
 #include <hpx/runtime/actions/continuation.hpp>
 #include <hpx/runtime/applier/applier.hpp>

diff --git a/tests/unit/parcelset/put_parcels_with_coalescing.cpp b/tests/unit/parcelset/put_parcels_with_coalescing.cpp
@@ -5,6 +5,7 @@
 
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_init.hpp>
+#include <hpx/include/actions.hpp>
 #include <hpx/include/performance_counters.hpp>
 #include <hpx/include/iostreams.hpp>
 #include <hpx/util/lightweight_test.hpp>

diff --git a/tests/unit/serialization/serialize_buffer.cpp b/tests/unit/serialization/serialize_buffer.cpp
@@ -6,6 +6,7 @@
 
 #include <hpx/hpx_init.hpp>
 #include <hpx/hpx.hpp>
+#include <hpx/include/actions.hpp>
 #include <hpx/util/lightweight_test.hpp>
 #include <hpx/runtime/serialization/serialize_buffer.hpp>