X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a64ca4c11a1eb7ba2ecd102f877ac571486a034..e91f26820b30a2d87b4c723e92eaebbd2dc5ce15:/src/xbt/exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 177b3f4f84..28d1c349c9 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -1,16 +1,16 @@
-/* Copyright (c) 2005-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/Exception.hpp"
-#include "src/kernel/context/Context.hpp"
 #include <xbt/config.hpp>
 #include <xbt/log.hpp>
 
 #include <boost/core/demangle.hpp>
 #include <mutex>
 #include <sstream>
+#include <typeinfo>
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_exception, xbt, "Exceptions");
@@ -24,8 +24,7 @@ void _xbt_throw(char* message, const char* file, int line, const char* func)
   throw e;
 }
 
-namespace simgrid {
-namespace xbt {
+namespace simgrid::xbt {
 
 ImpossibleError::~ImpossibleError()         = default;
 InitializationError::~InitializationError() = default;
@@ -78,17 +77,15 @@ static void show_backtrace(const simgrid::xbt::Backtrace& bt)
 
 static std::terminate_handler previous_terminate_handler = nullptr;
 
-static void handler()
+XBT_ATTRIB_NORETURN static void handler()
 {
   // Avoid doing crazy things if we get an uncaught exception inside an uncaught exception
-  static std::atomic_flag lock = ATOMIC_FLAG_INIT;
-  if (lock.test_and_set()) {
+  if (static std::atomic_flag lock = ATOMIC_FLAG_INIT; lock.test_and_set()) {
     XBT_ERROR("Handling an exception raised an exception. Bailing out.");
     std::abort();
   }
 
-  // Get the current backtrace and exception
-  simgrid::xbt::Backtrace bt = simgrid::xbt::Backtrace();
+  // Get the current exception and show backtrace
   try {
     std::rethrow_exception(std::current_exception());
   }
@@ -103,28 +100,24 @@ static void handler()
   // We manage C++ exception ourselves
   catch (const std::exception& e) {
     log_exception(xbt_log_priority_critical, "Uncaught exception", e);
-    show_backtrace(bt);
-    std::abort();
   }
 
   catch (const simgrid::ForcefulKillException&) {
     XBT_ERROR("Received a ForcefulKillException at the top-level exception handler. Maybe a Java->C++ call that is not "
               "protected in a try/catch?");
-    show_backtrace(bt);
   }
 
   // We don't know how to manage other exceptions
   catch (...) {
     // If there was another handler let's delegate to it
-    if (previous_terminate_handler)
+    if (previous_terminate_handler) {
       previous_terminate_handler();
-    else {
-      XBT_ERROR("Unknown uncaught exception");
-      show_backtrace(bt);
-      std::abort();
+      XBT_ERROR("Unexpected return from delegated terminate handler");
     }
+    XBT_ERROR("Unknown uncaught exception");
   }
-  XBT_INFO("BAM");
+  show_backtrace(simgrid::xbt::Backtrace());
+  std::abort();
 }
 
 void install_exception_handler()
@@ -135,8 +128,7 @@ void install_exception_handler()
   });
 }
 
-} // namespace xbt
-} // namespace simgrid
+} // namespace simgrid::xbt
 
 void xbt_throw_impossible(const char* file, int line, const char* func)
 {