Drop simgrid::xbt::demangle and use boost::core::demangle instead.

[simgrid.git] / src / xbt / exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 58dd0bb..cf4801a 100644 (file)
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -8,6 +8,7 @@
 #include <xbt/config.hpp>
 #include <xbt/log.hpp>
 
+#include <boost/core/demangle.hpp>
 #include <mutex>
 #include <sstream>
 
@@ -34,19 +35,19 @@ UnimplementedError::~UnimplementedError()   = default;
 void log_exception(e_xbt_log_priority_t prio, const char* context, std::exception const& exception)
 {
   try {
-    auto name = simgrid::xbt::demangle(typeid(exception).name());
+    std::string name = boost::core::demangle(typeid(exception).name());
 
     auto* with_context = dynamic_cast<const simgrid::Exception*>(&exception);
     if (with_context != nullptr) {
-      XBT_LOG(prio, "%s %s by %s/%d: %s", context, name.get(), with_context->throw_point().procname_.c_str(),
+      XBT_LOG(prio, "%s %s by %s/%d: %s", context, name.c_str(), with_context->throw_point().procname_.c_str(),
               with_context->throw_point().pid_, exception.what());
       // Do we have a backtrace?
       if (not simgrid::config::get_value<bool>("exception/cutpath")) {
         auto backtrace = with_context->resolve_backtrace();
-        XBT_LOG(prio, "  -> %s", backtrace.c_str());
+        XBT_LOG(prio, "Backtrace:\n%s", backtrace.c_str());
       }
     } else {
-      XBT_LOG(prio, "%s %s: %s", context, name.get(), exception.what());
+      XBT_LOG(prio, "%s %s: %s", context, name.c_str(), exception.what());
     }
   } catch (...) {
     // Don't log exceptions we got when trying to log exception
@@ -73,8 +74,7 @@ static void show_backtrace(const simgrid::xbt::Backtrace& bt)
     return;
   }
   std::string res = bt.resolve();
-  XBT_CRITICAL("Current backtrace:");
-  XBT_CRITICAL("  -> %s", res.c_str());
+  XBT_CRITICAL("Current backtrace:\n%s", res.c_str());
 }
 
 static std::terminate_handler previous_terminate_handler = nullptr;
@@ -89,10 +89,9 @@ static void handler()
   }
 
   // Get the current backtrace and exception
-  auto e = std::current_exception();
   simgrid::xbt::Backtrace bt = simgrid::xbt::Backtrace();
   try {
-    std::rethrow_exception(e);
+    std::rethrow_exception(std::current_exception());
   }
 
   // Parse error are handled differently, as the call stack does not matter, only the file location