Merge pull request STEllAR-GROUP#6701 from STEllAR-GROUP/fixing_6699

Attempting to fix shutdown hang on exception_info

Author: hkaiser

libs/core/resource_partitioner/src/detail_partitioner.cpp

@@ -35,13 +35,13 @@
 namespace hpx::resource::detail {
 
     ///////////////////////////////////////////////////////////////////////////
-    [[noreturn]] void throw_runtime_error(
+    [[noreturn]] static void throw_runtime_error(
         std::string const& func, std::string const& message)
     {
         HPX_THROW_EXCEPTION(hpx::error::invalid_status, func, message);
     }
 
-    [[noreturn]] void throw_invalid_argument(
+    [[noreturn]] static void throw_invalid_argument(
         std::string const& func, std::string const& message)
     {
         HPX_THROW_EXCEPTION(hpx::error::bad_parameter, func, message);
@@ -1008,9 +1008,12 @@ namespace hpx::resource::detail {
     void partitioner::unassign_pu(
         std::string const& pool_name, std::size_t virt_core)
     {
-        std::unique_lock<mutex_type> l(mtx_);
-        detail::init_pool_data& data = get_pool_data(l, pool_name);
-        data.unassign_pu(virt_core);
+        std::unique_lock<mutex_type> l(mtx_, std::defer_lock);
+        if (l.try_lock())
+        {
+            detail::init_pool_data& data = get_pool_data(l, pool_name);
+            data.unassign_pu(virt_core);
+        }
     }
 
     std::size_t partitioner::shrink_pool(std::string const& pool_name,
@@ -1185,7 +1188,7 @@ namespace hpx::resource::detail {
            << static_cast<std::uint64_t>(initial_thread_pools_.size())
            << " pool(s) : \n";    // -V128
 
-        for (auto itp : initial_thread_pools_)
+        for (auto const& itp : initial_thread_pools_)
         {
             itp.print_pool(os);
         }

libs/core/runtime_local/include/hpx/runtime_local/custom_exception_info.hpp

@@ -1,4 +1,4 @@
-//  Copyright (c) 2007-2024 Hartmut Kaiser
+//  Copyright (c) 2007-2025 Hartmut Kaiser
 //  Copyright (c) 2011      Bryce Lelbach
 //
 //  SPDX-License-Identifier: BSL-1.0
@@ -159,12 +159,27 @@ namespace hpx {
     HPX_CORE_EXPORT std::string diagnostic_information(
         exception_info const& xi);
 
+    HPX_CORE_EXPORT std::string default_diagnostic_information(
+        std::exception_ptr const& e);
+
     /// \cond NOINTERNAL
     template <typename E>
     std::string diagnostic_information(E const& e)
     {
-        return invoke_with_exception_info(e, [](exception_info const* xi) {
-            return xi ? diagnostic_information(*xi) : std::string("<unknown>");
+        return invoke_with_exception_info(e, [&](exception_info const* xi) {
+            if (xi)
+            {
+                return diagnostic_information(*xi);
+            }
+
+            if constexpr (std::is_same_v<std::exception_ptr, E>)
+            {
+                return default_diagnostic_information(e);
+            }
+            else
+            {
+                return std::string("<unknown>");
+            }
         });
     }
     /// \endcond

libs/core/runtime_local/src/custom_exception_info.cpp

@@ -1,4 +1,4 @@
-//  Copyright (c) 2007-2016 Hartmut Kaiser
+//  Copyright (c) 2007-2025 Hartmut Kaiser
 //  Copyright (c)      2011 Bryce Lelbach
 //
 //  SPDX-License-Identifier: BSL-1.0
@@ -66,6 +66,20 @@ namespace hpx {
     ///////////////////////////////////////////////////////////////////////////
     // Extract the diagnostic information embedded in the given exception and
     // return a string holding a formatted message.
+    std::string default_diagnostic_information(std::exception_ptr const& e)
+    {
+        try
+        {
+            if (e)
+                std::rethrow_exception(e);
+        }
+        catch (std::exception const& ex)
+        {
+            return {ex.what()};
+        }
+        return {"<unknown>"};
+    }
+
     std::string diagnostic_information(hpx::exception_info const& xi)
     {
         int const verbosity = util::from_string<int>(
@@ -173,7 +187,7 @@ namespace hpx::util {
 
     // This is a local helper used to get the backtrace on a new stack if
     // possible.
-    std::string trace_on_new_stack(
+    static std::string trace_on_new_stack(
         std::size_t frames_no = HPX_HAVE_THREAD_BACKTRACE_DEPTH)
     {
 #if defined(HPX_HAVE_STACKTRACES)
@@ -342,7 +356,7 @@ namespace hpx::detail {
 
     ///////////////////////////////////////////////////////////////////////////
     //  Figure out the size of the given environment
-    inline std::size_t get_arraylen(char** array)
+    static std::size_t get_arraylen(char** array)
     {
         std::size_t count = 0;
         if (nullptr != array)

libs/core/runtime_local/src/runtime_local.cpp

@@ -630,7 +630,6 @@ namespace hpx {
     void runtime::deinit_global_data()
     {
         runtime*& runtime_ = get_runtime_ptr();
-        HPX_ASSERT(runtime_);
         runtime_uptime() = 0;
         runtime_ = nullptr;
     }

libs/core/thread_pools/include/hpx/thread_pools/scheduled_thread_pool_impl.hpp

@@ -109,6 +109,13 @@ namespace hpx::threads::detail {
                 std::unique_lock<std::mutex> l(mtx);
                 stop_locked(l);
             }
+
+            // avoid problems during fatal exceptions handling
+            for (auto& t : threads_)
+            {
+                if (t.joinable())
+                    t.join();
+            }
             threads_.clear();
         }
     }
@@ -366,16 +373,20 @@ namespace hpx::threads::detail {
     void scheduled_thread_pool<Scheduler>::resume_internal(
         bool blocking, error_code& ec)
     {
+        // clang-format off
         for (std::size_t virt_core = 0; virt_core != threads_.size();
-             ++virt_core)
+            ++virt_core)
+        // clang-format on
         {
             this->sched_->Scheduler::resume(virt_core);
         }
 
         if (blocking)
         {
+            // clang-format off
             for (std::size_t virt_core = 0; virt_core != threads_.size();
-                 ++virt_core)
+                ++virt_core)
+            // clang-format on
             {
                 if (threads_[virt_core].joinable())
                 {

libs/core/threadmanager/include/hpx/modules/threadmanager.hpp

@@ -58,7 +58,7 @@ namespace hpx::threads {
             util::io_service_pool& timer_pool,
 #endif
             notification_policy_type& notifier,
-            detail::network_background_callback_type const&
+            detail::network_background_callback_type
                 network_background_callback =
                     detail::network_background_callback_type());