Merge pull request #7023 from STEllAR-GROUP/tracy_module

Fix adaptation of the Tracy module to C++ modules

Author: hkaiser

libs/core/tracy/include/hpx/tracy/tracy.hpp

@@ -14,13 +14,14 @@
 
 namespace hpx::tracy {
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT void set_thread_name(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void set_thread_name(
         char const* name) noexcept;
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT void enter_fiber(char const* name) noexcept;
-    HPX_CXX_EXPORT HPX_CORE_EXPORT void leave_fiber() noexcept;
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void enter_fiber(
+        char const* name) noexcept;
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void leave_fiber() noexcept;
 
-    HPX_CXX_EXPORT struct fiber_region
+    HPX_CXX_CORE_EXPORT struct fiber_region
     {
         explicit fiber_region(char const* name) noexcept
         {
@@ -33,10 +34,10 @@ namespace hpx::tracy {
         }
     };
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT void create_counter(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void create_counter(
         std::string const& name) noexcept;
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT void sample_value(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void sample_value(
         std::string const& name, double value) noexcept;
 
 }    // namespace hpx::tracy

libs/core/tracy/include/hpx/tracy/tracy_lock.hpp

@@ -15,26 +15,27 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace hpx::tracy {
 
-    HPX_CXX_EXPORT struct lock_data
+    HPX_CXX_CORE_EXPORT struct lock_data
     {
         void* context = nullptr;
     };
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT lock_data create(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT lock_data create(
         char const* name = nullptr) noexcept;
-    HPX_CXX_EXPORT HPX_CORE_EXPORT lock_data create(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT lock_data create(
         std::string const& name) noexcept;
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT void destroy(lock_data const&) noexcept;
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void destroy(lock_data const&) noexcept;
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT bool lock_prepare(lock_data const&) noexcept;
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT bool lock_prepare(
+        lock_data const&) noexcept;
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT void lock_acquired(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void lock_acquired(
         lock_data const&) noexcept;
-    HPX_CXX_EXPORT HPX_CORE_EXPORT void lock_acquired(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void lock_acquired(
         lock_data const&, bool acquired) noexcept;
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT void lock_released(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void lock_released(
         lock_data const&) noexcept;
 }    // namespace hpx::tracy
 

libs/core/tracy/include/hpx/tracy/tracy_tls.hpp

@@ -16,22 +16,22 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace hpx::tracy {
 
-    HPX_CXX_EXPORT struct region_data
+    HPX_CXX_CORE_EXPORT struct region_data
     {
         char const* name = nullptr;
         std::uint64_t data = 0;
         std::uint32_t color = 0;
         std::uint32_t phase = 0;
     };
 
-    HPX_CXX_EXPORT HPX_CORE_EXPORT region_data start_region(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT region_data start_region(
         char const*, std::size_t = 0, std::size_t = 0) noexcept;
-    HPX_CXX_EXPORT HPX_CORE_EXPORT char const* rename_region(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT char const* rename_region(
         char const*) noexcept;
-    HPX_CXX_EXPORT HPX_CORE_EXPORT region_data stop_region(
+    HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT region_data stop_region(
         region_data const& prev_region) noexcept;
 
-    HPX_CXX_EXPORT struct region
+    HPX_CXX_CORE_EXPORT struct region
     {
         explicit region(char const* name, std::size_t const thread_num,
             std::size_t phase) noexcept
@@ -48,7 +48,7 @@ namespace hpx::tracy {
         region_data surrounding_region;
     };
 
-    HPX_CXX_EXPORT struct suspend_region
+    HPX_CXX_CORE_EXPORT struct suspend_region
     {
         suspend_region() noexcept
           : suspended_region(stop_region({}))
@@ -67,7 +67,7 @@ namespace hpx::tracy {
         region_data suspended_region;
     };
 
-    HPX_CXX_EXPORT struct mark_event
+    HPX_CXX_CORE_EXPORT struct mark_event
     {
         explicit mark_event(char const* name) noexcept
           : previous_name(rename_region(name))