X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc01999f5003e51cc1d12f93647999a1a143f23..1873a02acdc52506c010f43b4c78a8b8400dc0de:/src/xbt/exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 230e330c0d..a1c6d0b52b 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2016. The SimGrid Team.
+/* Copyright (c) 2005-2017. The SimGrid Team.
  * All rights reserved. */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -15,6 +15,8 @@
 #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>
@@ -27,7 +29,7 @@ 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,
@@ -47,7 +49,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 xbt_cfg_get_boolean("exception/cutpath")) {
       auto backtrace = simgrid::xbt::resolveBacktrace(
         with_context->backtrace().data(), with_context->backtrace().size());
       for (std::string const& s : backtrace)
@@ -76,6 +78,10 @@ void logException(
 
 static void showBacktrace(std::vector<xbt_backtrace_location_t>& bt)
 {
+  if (xbt_cfg_get_boolean("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)
@@ -90,7 +96,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();
   }
 
@@ -132,8 +138,3 @@ void installExceptionHandler()
 
 }
 }
-
-void xbt_set_terminate()
-{
-  simgrid::xbt::installExceptionHandler();
-}