Adapting HPX modules from level 11 to C++ modules

Signed-off-by: Hartmut Kaiser <hartmut.kaiser@gmail.com>

Author: hkaiser

.github/workflows/windows_debug_vs2022_modules.yml

@@ -23,6 +23,8 @@ jobs:
         $client = new-object System.Net.WebClient
         $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
         7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
+        del /f /s /q C:\projects\vcpkg\installed\x64-windows\include\asio\
+        del /f /q C:\projects\vcpkg\installed\x64-windows\include\asio.hpp
     - name: Configure
       shell: bash
       run: |

CMakeLists.txt

@@ -1,5 +1,5 @@
 # Copyright (c)      2020 Mikael Simberg
-# Copyright (c) 2007-2024 Hartmut Kaiser
+# Copyright (c) 2007-2025 Hartmut Kaiser
 # Copyright (c) 2011-2014 Thomas Heller
 # Copyright (c)      2024 Isidoros Tsaousis-Seiras
 # Copyright (c) 2007-2008 Chirag Dekate
@@ -1710,6 +1710,12 @@ if(HPX_WITH_TUPLE_RVALUE_SWAP)
   hpx_add_config_define(HPX_HAVE_TUPLE_RVALUE_SWAP)
 endif()
 
+hpx_option(
+  HPX_WITH_MODULE_COMPATIBILITY_HEADERS BOOL
+  "Generate backwards-compatibility headers for HPX Modules (default: OFF)" OFF
+  ADVANCED
+)
+
 # ##############################################################################
 # Special diagnostic flags, do not enable by default, only if needed
 hpx_option(

cmake/HPX_AddModule.cmake

@@ -106,7 +106,7 @@ function(add_hpx_module libname modulename)
   hpx_debug("Add module ${modulename}: SOURCE_ROOT: ${SOURCE_ROOT}")
   hpx_debug("Add module ${modulename}: HEADER_ROOT: ${HEADER_ROOT}")
 
-  if(${modulename}_COMPAT_HEADERS)
+  if(HPX_WITH_MODULE_COMPATIBILITY_HEADERS AND ${modulename}_COMPAT_HEADERS)
     set(COMPAT_HEADER_ROOT "${CMAKE_CURRENT_BINARY_DIR}/include_compatibility")
     file(MAKE_DIRECTORY ${COMPAT_HEADER_ROOT})
     hpx_debug(
@@ -123,7 +123,7 @@ function(add_hpx_module libname modulename)
   list(TRANSFORM ${modulename}_HEADERS PREPEND ${HEADER_ROOT}/ OUTPUT_VARIABLE
                                                                headers
   )
-  if(${modulename}_COMPAT_HEADERS)
+  if(HPX_WITH_MODULE_COMPATIBILITY_HEADERS AND ${modulename}_COMPAT_HEADERS)
     string(REPLACE ";=>;" "=>" ${modulename}_COMPAT_HEADERS
                    "${${modulename}_COMPAT_HEADERS}"
     )
@@ -499,7 +499,7 @@ function(add_hpx_module libname modulename)
     target_link_libraries(hpx_${modulename} PUBLIC hpx_config_registry)
   endif()
 
-  if(${modulename}_COMPAT_HEADERS)
+  if(HPX_WITH_MODULE_COMPATIBILITY_HEADERS AND ${modulename}_COMPAT_HEADERS)
     target_include_directories(
       hpx_${modulename} PUBLIC $<BUILD_INTERFACE:${COMPAT_HEADER_ROOT}>
     )
@@ -533,7 +533,7 @@ function(add_hpx_module libname modulename)
     CLASS "Source Files"
     TARGETS ${sources}
   )
-  if(${modulename}_COMPAT_HEADERS)
+  if(HPX_WITH_MODULE_COMPATIBILITY_HEADERS AND ${modulename}_COMPAT_HEADERS)
     add_hpx_source_group(
       NAME hpx_${modulename}
       ROOT ${COMPAT_HEADER_ROOT}/hpx
@@ -603,7 +603,7 @@ function(add_hpx_module libname modulename)
   )
 
   # Install the compatibility headers from the source
-  if(${modulename}_COMPAT_HEADERS)
+  if(HPX_WITH_MODULE_COMPATIBILITY_HEADERS AND ${modulename}_COMPAT_HEADERS)
     install(
       DIRECTORY ${COMPAT_HEADER_ROOT}/hpx
       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

cmake/templates/std_headers.hpp.in

@@ -14,6 +14,7 @@
 
 @cxx_standard_headers@
 // Some standard headers include the following headers.
+#include <filesystem>
 #include <numeric>
 
 #if defined(HPX_HAVE_CXX20_COROUTINES)
@@ -45,3 +46,5 @@
 #include <excpt.h>
 #undef exception_info
 #endif
+
+#include <asio.hpp>

components/iostreams/include/hpx/components/iostreams/ostream.hpp

@@ -14,8 +14,8 @@
 #include <hpx/components/client_base.hpp>
 #include <hpx/components/iostreams/manipulators.hpp>
 #include <hpx/components/iostreams/server/output_stream.hpp>
-#include <hpx/lock_registration/detail/register_locks.hpp>
 #include <hpx/modules/async_distributed.hpp>
+#include <hpx/modules/lock_registration.hpp>
 #include <hpx/modules/type_support.hpp>
 
 #include <boost/iostreams/stream.hpp>

components/iostreams/src/server/output_stream.cpp

@@ -65,7 +65,7 @@ namespace hpx::iostreams::server {
         // enough.
         hpx::id_type this_id = this->get_id();
 #if ASIO_VERSION >= 103400
-        asio::post(hpx::get_thread_pool("io_pool")->get_io_service(),
+        ::asio::post(hpx::get_thread_pool("io_pool")->get_io_service(),
             hpx::bind_front(&output_stream::call_write_async, this, locality_id,
                 count, HPX_MOVE(in), HPX_MOVE(this_id)));
 #else
@@ -94,7 +94,7 @@ namespace hpx::iostreams::server {
         // Perform the IO in another OS thread.
         detail::buffer in(buf_in);
 #if ASIO_VERSION >= 103400
-        asio::post(hpx::get_thread_pool("io_pool")->get_io_service(),
+        ::asio::post(hpx::get_thread_pool("io_pool")->get_io_service(),
             hpx::bind_front(&output_stream::call_write_sync, this, locality_id,
                 count, std::ref(in),
                 threads::thread_id_ref_type(threads::get_outer_self_id())));

components/parcel_plugins/coalescing/src/coalescing_message_handler.cpp

@@ -11,11 +11,11 @@
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/format.hpp>
 #include <hpx/modules/functional.hpp>
+#include <hpx/modules/plugin.hpp>
 #include <hpx/modules/runtime_local.hpp>
 #include <hpx/modules/thread_support.hpp>
 #include <hpx/modules/timing.hpp>
 #include <hpx/modules/util.hpp>
-#include <hpx/plugin/traits/plugin_config_data.hpp>
 
 #include <hpx/parcel_coalescing/counter_registry.hpp>
 #include <hpx/parcel_coalescing/message_handler.hpp>

components/performance_counters/papi/src/util/papi.cpp

@@ -294,7 +294,7 @@ namespace hpx { namespace performance_counters { namespace papi {
         // list available events with descriptions
         void list_events(std::string const& scope)
         {
-            using asio::ip::host_name;
+            using ::asio::ip::host_name;
 
             std::string host(host_name());
             // print header

components/process/include/hpx/components/process/util/mitigate.hpp

@@ -20,9 +20,9 @@
 namespace hpx { namespace components { namespace process { namespace util {
 
 #if defined(HPX_WINDOWS)
-    typedef asio::windows::stream_handle pipe_end;
+    typedef ::asio::windows::stream_handle pipe_end;
 #else
-    typedef asio::posix::stream_descriptor pipe_end;
+    typedef ::asio::posix::stream_descriptor pipe_end;
 #endif
 
     inline const char* zero_device()

examples/async_io/async_io_low_level.cpp

@@ -40,7 +40,7 @@ hpx::future<int> async_io(char const* string_to_write)
 
     // ... and schedule the handler to run on one of its OS-threads.
 #if ASIO_VERSION >= 103400
-    asio::post(
+    ::asio::post(
         pool->get_io_service(), hpx::bind(&do_async_io, string_to_write, p));
 #else
     pool->get_io_service().post(hpx::bind(&do_async_io, string_to_write, p));