X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09ae311009060c8bf6cda09873b78f81b268badd..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/xbt/exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 49f6188893..dd91449b99 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -1,28 +1,32 @@
-/* Copyright (c) 2005-2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2005-2018. 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 <cstdlib>
+
+#include <atomic>
 #include <exception>
+#include <string>
 #include <typeinfo>
+#include <vector>
 #include <memory>
 #include <mutex>
 
 #include <xbt/backtrace.hpp>
+#include <xbt/config.hpp>
+#include <xbt/ex.hpp>
 #include <xbt/exception.hpp>
 #include <xbt/log.h>
 #include <xbt/log.hpp>
 
-extern "C" {
 XBT_LOG_EXTERNAL_CATEGORY(xbt);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_exception, xbt, "Exceptions");
-}
 
 namespace simgrid {
 namespace xbt {
 
-WithContextException::~WithContextException() {}
+WithContextException::~WithContextException() = default;
 
 void logException(
   e_xbt_log_priority_t prio,
@@ -31,8 +35,7 @@ void logException(
   try {
     auto name = simgrid::xbt::demangle(typeid(exception).name());
 
-    auto with_context =
-      dynamic_cast<const simgrid::xbt::WithContextException*>(&exception);
+    auto* with_context = dynamic_cast<const simgrid::xbt::WithContextException*>(&exception);
     if (with_context != nullptr)
       XBT_LOG(prio, "%s %s by %s/%d: %s",
         context, name.get(),
@@ -42,7 +45,7 @@ void logException(
       XBT_LOG(prio, "%s %s: %s", context, name.get(), exception.what());
 
     // Do we have a backtrace?
-    if (with_context != nullptr) {
+    if (with_context != nullptr && not simgrid::config::get_value<bool>("exception/cutpath")) {
       auto backtrace = simgrid::xbt::resolveBacktrace(
         with_context->backtrace().data(), with_context->backtrace().size());
       for (std::string const& s : backtrace)
@@ -50,7 +53,7 @@ void logException(
     }
 
     // Do we have a nested exception?
-    auto with_nested = dynamic_cast<const std::nested_exception*>(&exception);
+    auto* with_nested = dynamic_cast<const std::nested_exception*>(&exception);
     if (with_nested == nullptr ||  with_nested->nested_ptr() == nullptr)
       return;
     try {
@@ -71,6 +74,10 @@ void logException(
 
 static void showBacktrace(std::vector<xbt_backtrace_location_t>& bt)
 {
+  if (simgrid::config::get_value<bool>("exception/cutpath")) {
+    XBT_LOG(xbt_log_priority_critical, "Display of current backtrace disabled by --cfg=exception/cutpath.");
+    return;
+  }
   std::vector<std::string> res = resolveBacktrace(&bt[0], bt.size());
   XBT_LOG(xbt_log_priority_critical, "Current backtrace:");
   for (std::string const& s : res)
@@ -85,7 +92,7 @@ static void handler()
   // an uncaught exception
   static std::atomic_flag lock = ATOMIC_FLAG_INIT;
   if (lock.test_and_set()) {
-    XBT_ERROR("Multiple uncaught exceptions");
+    XBT_ERROR("Handling an exception raised an exception. Bailing out.");
     std::abort();
   }
 
@@ -127,8 +134,3 @@ void installExceptionHandler()
 
 }
 }
-
-void xbt_set_terminate()
-{
-  simgrid::xbt::installExceptionHandler();
-}