X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6a24bce95a8c071c0e1131eecb5e7985e02970a..e9b4cebcaf4f3e53ef6edb37514e4e989009266b:/src/xbt/exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 2d0748a2f5..bccfd6d4d3 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2021. 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. */
@@ -37,36 +37,32 @@ void log_exception(e_xbt_log_priority_t prio, const char* context, std::exceptio
     auto name = simgrid::xbt::demangle(typeid(exception).name());
 
     auto* with_context = dynamic_cast<const simgrid::Exception*>(&exception);
-    if (with_context != nullptr)
+    if (with_context != nullptr) {
       XBT_LOG(prio, "%s %s by %s/%d: %s", context, name.get(), with_context->throw_point().procname_.c_str(),
               with_context->throw_point().pid_, exception.what());
-    else
+      // 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());
+      }
+    } else {
       XBT_LOG(prio, "%s %s: %s", context, name.get(), exception.what());
-
-    // Do we have a backtrace?
-    if (with_context != nullptr && not simgrid::config::get_value<bool>("exception/cutpath")) {
-      auto backtrace = with_context->resolve_backtrace();
-      XBT_LOG(prio, "  -> %s", backtrace.c_str());
     }
+  } catch (...) {
+    // Don't log exceptions we got when trying to log exception
+    XBT_LOG(prio, "Ignoring exception caught while while trying to log an exception!");
+  }
 
+  try {
     // Do we have a nested exception?
     auto* with_nested = dynamic_cast<const std::nested_exception*>(&exception);
-    if (with_nested == nullptr ||  with_nested->nested_ptr() == nullptr)
-      return;
-    try {
+    if (with_nested != nullptr && with_nested->nested_ptr() != nullptr)
       with_nested->rethrow_nested();
-    }
-    catch (std::exception& nested_exception) {
-      log_exception(prio, "Caused by", nested_exception);
-    }
+  } catch (const std::exception& nested_exception) {
+    log_exception(prio, "Caused by", nested_exception);
+  } catch (...) {
     // We could catch nested_exception or WithContextException but we don't bother:
-    catch (...) {
-      XBT_LOG(prio, "Caused by an unknown exception");
-    }
-  }
-  catch (...) {
-    // Don't log exceptions we got when trying to log exception
-    XBT_LOG(prio, "Ignoring exception caught while while trying to log an exception!");
+    XBT_LOG(prio, "Caused by an unknown exception");
   }
 }
 
@@ -93,21 +89,20 @@ 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
-  catch (simgrid::ParseError& e) {
+  catch (const simgrid::ParseError& e) {
     XBT_ERROR("%s", e.what());
     XBT_ERROR("Exiting now.");
     std::abort();
   }
 
   // We manage C++ exception ourselves
-  catch (std::exception& e) {
+  catch (const std::exception& e) {
     log_exception(xbt_log_priority_critical, "Uncaught exception", e);
     show_backtrace(bt);
     std::abort();