Adapting modules of level 39/40 to C++20 modules

.codacy.yml

@@ -13,5 +13,6 @@ exclude_paths:
 tools:
   duplication:
     exclude:
+      - "examples/**"
       - "tests/**"
       - "**/tests/**"

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_decl.hpp

@@ -11,12 +11,11 @@
 
 #include <hpx/config.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/distribution_policies/container_distribution_policy.hpp>
-#include <hpx/distribution_policies/explicit_container_distribution_policy.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_base.hpp>
 #include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/components.hpp>
+#include <hpx/modules/distribution_policies.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/runtime_components.hpp>
 #include <hpx/modules/type_support.hpp>

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_impl.hpp

@@ -9,13 +9,12 @@
 
 #include <hpx/config.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/distribution_policies/container_distribution_policy.hpp>
-#include <hpx/distribution_policies/explicit_container_distribution_policy.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_base.hpp>
 #include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/async_distributed.hpp>
 #include <hpx/modules/components.hpp>
+#include <hpx/modules/distribution_policies.hpp>
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/execution.hpp>
 #include <hpx/modules/runtime_components.hpp>

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_predef.hpp

@@ -7,8 +7,7 @@
 
 #pragma once
 
-#include <hpx/distribution_policies/container_distribution_policy.hpp>
-#include <hpx/distribution_policies/explicit_container_distribution_policy.hpp>
+#include <hpx/modules/distribution_policies.hpp>
 
 #include <hpx/components/containers/partitioned_vector/export_definitions.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp>

components/containers/partitioned_vector/src/partitioned_vector_component_double.cpp

@@ -7,8 +7,7 @@
 #include <hpx/config.hpp>
 
 #if !defined(HPX_HAVE_STATIC_LINKING)
-#include <hpx/distribution_policies/container_distribution_policy.hpp>
-#include <hpx/distribution_policies/explicit_container_distribution_policy.hpp>
+#include <hpx/modules/distribution_policies.hpp>
 
 #include <hpx/components/containers/partitioned_vector/export_definitions.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector.hpp>

components/containers/partitioned_vector/src/partitioned_vector_component_int.cpp

@@ -7,8 +7,7 @@
 #include <hpx/config.hpp>
 
 #if !defined(HPX_HAVE_STATIC_LINKING)
-#include <hpx/distribution_policies/container_distribution_policy.hpp>
-#include <hpx/distribution_policies/explicit_container_distribution_policy.hpp>
+#include <hpx/modules/distribution_policies.hpp>
 
 #include <hpx/components/containers/partitioned_vector/export_definitions.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector.hpp>

components/containers/partitioned_vector/src/partitioned_vector_component_std_string.cpp

@@ -7,8 +7,7 @@
 #include <hpx/config.hpp>
 
 #if !defined(HPX_HAVE_STATIC_LINKING)
-#include <hpx/distribution_policies/container_distribution_policy.hpp>
-#include <hpx/distribution_policies/explicit_container_distribution_policy.hpp>
+#include <hpx/modules/distribution_policies.hpp>
 
 #include <hpx/components/containers/partitioned_vector/export_definitions.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector.hpp>

components/containers/unordered/include/hpx/components/containers/unordered/unordered_map.hpp

@@ -10,11 +10,11 @@
 
 #include <hpx/config.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/distribution_policies/container_distribution_policy.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/components.hpp>
 #include <hpx/modules/components_base.hpp>
+#include <hpx/modules/distribution_policies.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/runtime_components.hpp>
 #include <hpx/modules/serialization.hpp>

components/parcel_plugins/coalescing/include/hpx/parcel_coalescing/counter_registry.hpp

@@ -11,11 +11,10 @@
 #if defined(HPX_HAVE_NETWORKING) && defined(HPX_HAVE_PARCEL_COALESCING)
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/hashing.hpp>
+#include <hpx/modules/performance_counters.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/type_support.hpp>
 
-#include <hpx/performance_counters/counters_fwd.hpp>
-
 #include <cstdint>
 #include <string>
 #include <unordered_map>

components/parcel_plugins/coalescing/src/coalescing_counter_registry.cpp

@@ -9,9 +9,9 @@
 #if defined(HPX_HAVE_NETWORKING) && defined(HPX_HAVE_PARCEL_COALESCING)
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/util.hpp>
+#include <hpx/modules/performance_counters.hpp>
 
 #include <hpx/parcel_coalescing/counter_registry.hpp>
-#include <hpx/performance_counters/registry.hpp>
 
 #include <cstdint>
 #include <mutex>

components/parcel_plugins/coalescing/src/performance_counters.cpp

@@ -16,10 +16,9 @@
 #include <hpx/modules/string_util.hpp>
 
 #include <hpx/modules/components_base.hpp>
+#include <hpx/modules/performance_counters.hpp>
+
 #include <hpx/parcel_coalescing/counter_registry.hpp>
-#include <hpx/performance_counters/counter_creators.hpp>
-#include <hpx/performance_counters/counters.hpp>
-#include <hpx/performance_counters/manage_counter_type.hpp>
 
 #include <cstdint>
 #include <exception>

components/performance_counters/io/src/io_counters.cpp

@@ -7,15 +7,15 @@
 
 #include <hpx/config.hpp>
 #include <hpx/modules/components_base.hpp>
+#include <hpx/modules/errors.hpp>
 #include <hpx/modules/format.hpp>
 #include <hpx/modules/functional.hpp>
+#include <hpx/modules/performance_counters.hpp>
 #include <hpx/modules/runtime_configuration.hpp>
 #include <hpx/modules/runtime_local.hpp>
-#include <hpx/performance_counters/manage_counter_type.hpp>
 
 #include <hpx/components/performance_counters/io/io_counters.hpp>
 
-#include <hpx/modules/errors.hpp>
 #include <boost/fusion/include/define_struct.hpp>
 #include <boost/fusion/include/io.hpp>
 #include <boost/phoenix/core.hpp>

components/performance_counters/memory_counters/src/memory.cpp

@@ -8,9 +8,9 @@
 #include <hpx/config.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/functional.hpp>
+#include <hpx/modules/performance_counters.hpp>
 #include <hpx/modules/runtime_configuration.hpp>
 #include <hpx/modules/runtime_local.hpp>
-#include <hpx/performance_counters/manage_counter_type.hpp>
 
 #include <hpx/components/performance_counters/memory_counters/mem_counter.hpp>
 

components/performance_counters/papi/include/hpx/components/performance_counters/papi/server/papi.hpp

@@ -12,8 +12,8 @@
 #if defined(HPX_HAVE_PAPI)
 
 #include <hpx/modules/components_base.hpp>
+#include <hpx/modules/performance_counters.hpp>
 #include <hpx/modules/runtime_local.hpp>
-#include <hpx/performance_counters/server/base_performance_counter.hpp>
 
 #include <cstdint>
 #include <map>

components/performance_counters/papi/include/hpx/components/performance_counters/papi/util/papi.hpp

@@ -13,8 +13,8 @@
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/format.hpp>
 #include <hpx/modules/iterator_support.hpp>
+#include <hpx/modules/performance_counters.hpp>
 #include <hpx/modules/program_options.hpp>
-#include <hpx/performance_counters/counters.hpp>
 
 #include <cstdint>
 #include <cstring>

components/performance_counters/papi/src/papi_startup.cpp

@@ -8,18 +8,17 @@
 #include <hpx/config.hpp>
 
 #if defined(HPX_HAVE_PAPI)
-
-#include <hpx/components/performance_counters/papi/server/papi.hpp>
-#include <hpx/components/performance_counters/papi/util/papi.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/iterator_support.hpp>
+#include <hpx/modules/performance_counters.hpp>
 #include <hpx/modules/program_options.hpp>
 #include <hpx/modules/runtime_configuration.hpp>
 #include <hpx/modules/runtime_local.hpp>
-#include <hpx/performance_counters/counter_creators.hpp>
-#include <hpx/performance_counters/manage_counter_type.hpp>
+
+#include <hpx/components/performance_counters/papi/server/papi.hpp>
+#include <hpx/components/performance_counters/papi/util/papi.hpp>
 
 #include <cctype>
 #include <cstdint>
@@ -289,11 +288,11 @@ namespace hpx { namespace performance_counters { namespace papi {
         using namespace hpx::performance_counters;
 
         // define & install generic PAPI counter type
-        generic_counter_type_data const papi_cnt_type = {"/papi",
+        constexpr generic_counter_type_data papi_cnt_type = {"/papi",
             counter_type::raw,
             "the current count of occurrences of a specific PAPI event",
-            HPX_PERFORMANCE_COUNTER_V1, &create_papi_counter,
-            &discover_papi_counters, ""};
+            performance_counters::HPX_PERFORMANCE_COUNTER_V1,
+            &create_papi_counter, &discover_papi_counters, ""};
         install_counter_types(&papi_cnt_type, 1);
 
         // deferred options

components/performance_counters/power/src/power.cpp

@@ -7,9 +7,9 @@
 #include <hpx/config.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/functional.hpp>
+#include <hpx/modules/performance_counters.hpp>
 #include <hpx/modules/runtime_configuration.hpp>
 #include <hpx/modules/runtime_local.hpp>
-#include <hpx/performance_counters/manage_counter_type.hpp>
 
 #include <hpx/components/performance_counters/power/power_counter.hpp>
 

examples/performance_counters/sine/sine.cpp

@@ -224,7 +224,8 @@ namespace performance_counters { namespace sine {
             {"/sine/immediate/explicit", counter_type::raw,
                 "returns the current value of a sine wave calculated over "
                 "an arbitrary time line (explicit, hand-rolled version)",
-                HPX_PERFORMANCE_COUNTER_V1, &explicit_sine_counter_creator,
+                hpx::performance_counters::HPX_PERFORMANCE_COUNTER_V1,
+                &explicit_sine_counter_creator,
                 &explicit_sine_counter_discoverer, ""},
             // We assume that valid counter names have the following scheme:
             //
@@ -237,7 +238,7 @@ namespace performance_counters { namespace sine {
                 "returns the current value of a sine wave calculated over "
                 "an arbitrary time line (implicit version, using HPX "
                 "facilities)",
-                HPX_PERFORMANCE_COUNTER_V1,
+                hpx::performance_counters::HPX_PERFORMANCE_COUNTER_V1,
                 hpx::bind(
                     &hpx::performance_counters::locality_raw_counter_creator,
                     _1, &immediate_sine, _2),

libs/full/actions/include/hpx/actions/macros.hpp

@@ -7,9 +7,10 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions_base/macros.hpp>
 #include <hpx/modules/preprocessor.hpp>
 
+#include <hpx/actions_base/macros.hpp>
+
 #include <type_traits>
 
 #if defined(HPX_HAVE_NETWORKING)

libs/full/collectives/CMakeLists.txt

@@ -83,6 +83,7 @@ add_hpx_module(
     hpx_components
     hpx_components_base
     hpx_naming_base
+    hpx_performance_counters
     hpx_runtime_components
     hpx_runtime_distributed
   CMAKE_SUBDIRS examples tests

libs/full/collectives/src/latch.cpp

@@ -5,18 +5,19 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/assert.hpp>
-#include <hpx/collectives/latch.hpp>
 #include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_distributed.hpp>
 #include <hpx/modules/components.hpp>
 #include <hpx/modules/futures.hpp>
+#include <hpx/modules/performance_counters.hpp>
 #include <hpx/modules/runtime_components.hpp>
 #include <hpx/modules/runtime_local.hpp>
 #include <hpx/modules/type_support.hpp>
-#include <hpx/performance_counters/counters.hpp>
 #include <hpx/runtime_distributed/find_here.hpp>
 
+#include <hpx/collectives/latch.hpp>
+
 #include <cstddef>
 #include <exception>
 #include <utility>

libs/full/distribution_policies/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021 The STE||AR-Group
+# Copyright (c) 2019-2026 The STE||AR-Group
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -31,12 +31,15 @@ set(distribution_policies_compat_headers
 )
 # cmake-format: on
 
-set(distribution_policies_sources binpacking_distribution_policy.cpp)
+set(distribution_policies_sources binpacking_distribution_policy.cpp
+                                  distribution_policies.cpp
+)
 
 include(HPX_AddModule)
 add_hpx_module(
   full distribution_policies
   GLOBAL_HEADER_GEN ON
+  GLOBAL_HEADER_MODULE_GEN ON
   SOURCES ${distribution_policies_sources}
   HEADERS ${distribution_policies_headers}
   COMPAT_HEADERS ${distribution_policies_compat_headers}

libs/full/distribution_policies/include/hpx/distribution_policies/binpacking_distribution_policy.hpp

@@ -1,4 +1,4 @@
-//  Copyright (c) 2007-2023 Hartmut Kaiser
+//  Copyright (c) 2007-2026 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -17,9 +17,9 @@
 #include <hpx/modules/futures.hpp>
 #include <hpx/modules/naming_base.hpp>
 #include <hpx/modules/pack_traversal.hpp>
+#include <hpx/modules/performance_counters.hpp>
 #include <hpx/modules/runtime_components.hpp>
 #include <hpx/modules/serialization.hpp>
-#include <hpx/performance_counters/performance_counter.hpp>
 
 #include <algorithm>
 #include <cstddef>
@@ -32,8 +32,9 @@
 
 namespace hpx::components {
 
-    inline constexpr char const* const default_binpacking_counter_name =
-        "/runtime{locality/total}/count/component@";
+    HPX_CXX_EXPORT inline constexpr char const* const
+        default_binpacking_counter_name =
+            "/runtime{locality/total}/count/component@";
 
     namespace detail {
 
@@ -150,7 +151,7 @@ namespace hpx::components {
     /// each of the localities will equalize the number of overall objects of
     /// this type based on a given criteria (by default this criteria is the
     /// overall number of objects of this type).
-    struct binpacking_distribution_policy
+    HPX_CXX_EXPORT struct binpacking_distribution_policy
     {
     public:
         /// Default-construct a new instance of a \a binpacking_distribution_policy.
@@ -372,14 +373,15 @@ namespace hpx::components {
 
     /// A predefined instance of the binpacking \a distribution_policy. It will
     /// represent the local locality and will place all items to create here.
-    static binpacking_distribution_policy const binpacked{};
+    HPX_CXX_EXPORT HPX_EXPORT extern binpacking_distribution_policy const
+        binpacked;
 }    // namespace hpx::components
 
 /// \cond NOINTERNAL
 namespace hpx {
 
-    using hpx::components::binpacked;
-    using hpx::components::binpacking_distribution_policy;
+    HPX_CXX_EXPORT using hpx::components::binpacked;
+    HPX_CXX_EXPORT using hpx::components::binpacking_distribution_policy;
 
     template <>
     struct traits::is_distribution_policy<

libs/full/distribution_policies/include/hpx/distribution_policies/colocating_distribution_policy.hpp

@@ -1,4 +1,4 @@
-//  Copyright (c) 2014-2024 Hartmut Kaiser
+//  Copyright (c) 2014-2026 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -31,7 +31,7 @@ namespace hpx::components {
     /// This class specifies the parameters for a distribution policy to use
     /// for creating a given number of items on the locality where a given
     /// object is currently placed.
-    struct colocating_distribution_policy
+    HPX_CXX_EXPORT struct colocating_distribution_policy
     {
         /// Default-construct a new instance of a \a colocating_distribution_policy.
         /// This policy will represent the local locality.
@@ -364,14 +364,15 @@ namespace hpx::components {
     /// A predefined instance of the co-locating \a distribution_policy. It
     /// will represent the local locality and will place all items to create
     /// here.
-    static colocating_distribution_policy const colocated{};
+    HPX_CXX_EXPORT HPX_EXPORT extern colocating_distribution_policy const
+        colocated;
 }    // namespace hpx::components
 
 /// \cond NOINTERNAL
 namespace hpx {
 
-    using hpx::components::colocated;
-    using hpx::components::colocating_distribution_policy;
+    HPX_CXX_EXPORT using hpx::components::colocated;
+    HPX_CXX_EXPORT using hpx::components::colocating_distribution_policy;
 
     template <>
     struct traits::is_distribution_policy<