X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..1cfe59d9943d547557996152887b4af3a8a5f17e:/src/xbt/exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 0a0f335d86..73f18098f6 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -1,9 +1,10 @@
-/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2019. 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>
 
@@ -21,7 +22,7 @@ xbt_ex::~xbt_ex() = default;
 
 void _xbt_throw(char* message, xbt_errcat_t errcat, int value, const char* file, int line, const char* func)
 {
-  xbt_ex e(simgrid::xbt::ThrowPoint(file, line, func, simgrid::xbt::backtrace(), xbt_procname(), xbt_getpid()),
+  xbt_ex e(simgrid::xbt::ThrowPoint(file, line, func, simgrid::xbt::Backtrace(), xbt_procname(), xbt_getpid()),
            message);
   xbt_free(message);
   e.category = errcat;
@@ -29,12 +30,6 @@ void _xbt_throw(char* message, xbt_errcat_t errcat, int value, const char* file,
   throw e;
 }
 
-/** @brief shows an exception content and the associated stack if available */
-void xbt_ex_display(xbt_ex_t* e)
-{
-  simgrid::xbt::log_exception(xbt_log_priority_critical, "UNCAUGHT EXCEPTION", *e);
-}
-
 /** @brief returns a short name for the given exception category */
 const char* xbt_ex_catname(xbt_errcat_t cat)
 {
@@ -70,7 +65,6 @@ const char* xbt_ex_catname(xbt_errcat_t cat)
     default:
       return "INVALID ERROR";
   }
-  return "INVALID ERROR";
 }
 
 namespace simgrid {
@@ -90,10 +84,8 @@ void log_exception(e_xbt_log_priority_t prio, const char* context, std::exceptio
 
     // Do we have a backtrace?
     if (with_context != nullptr && not simgrid::config::get_value<bool>("exception/cutpath")) {
-      auto backtrace = simgrid::xbt::resolve_backtrace(with_context->throw_point().backtrace_.data(),
-                                                       with_context->throw_point().backtrace_.size());
-      for (std::string const& s : backtrace)
-        XBT_LOG(prio, "  -> %s", s.c_str());
+      auto backtrace = with_context->resolve_backtrace();
+      XBT_LOG(prio, "  -> %s", backtrace.c_str());
     }
 
     // Do we have a nested exception?
@@ -113,19 +105,19 @@ void log_exception(e_xbt_log_priority_t prio, const char* context, std::exceptio
   }
   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!");
   }
 }
 
-static void showBacktrace(std::vector<xbt_backtrace_location_t>& bt)
+static void show_backtrace(const simgrid::xbt::Backtrace& bt)
 {
   if (simgrid::config::get_value<bool>("exception/cutpath")) {
-    XBT_LOG(xbt_log_priority_critical, "Display of current backtrace disabled by --cfg=exception/cutpath.");
+    XBT_CRITICAL("Display of current backtrace disabled by --cfg=exception/cutpath.");
     return;
   }
-  std::vector<std::string> res = resolve_backtrace(&bt[0], bt.size());
-  XBT_LOG(xbt_log_priority_critical, "Current backtrace:");
-  for (std::string const& s : res)
-    XBT_LOG(xbt_log_priority_critical, "  -> %s", s.c_str());
+  std::string res = bt.resolve();
+  XBT_CRITICAL("Current backtrace:");
+  XBT_CRITICAL("  -> %s", res.c_str());
 }
 
 static std::terminate_handler previous_terminate_handler = nullptr;
@@ -142,7 +134,7 @@ static void handler()
 
   // Get the current backtrace and exception
   auto e = std::current_exception();
-  auto bt = backtrace();
+  simgrid::xbt::Backtrace bt = simgrid::xbt::Backtrace();
   try {
     std::rethrow_exception(e);
   }
@@ -150,10 +142,17 @@ static void handler()
   // We manage C++ exception ourselves
   catch (std::exception& e) {
     log_exception(xbt_log_priority_critical, "Uncaught exception", e);
-    showBacktrace(bt);
+    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
@@ -161,11 +160,10 @@ static void handler()
       previous_terminate_handler();
     else {
       XBT_ERROR("Unknown uncaught exception");
-      showBacktrace(bt);
+      show_backtrace(bt);
       std::abort();
     }
   }
-
 }
 
 void install_exception_handler()
@@ -175,15 +173,6 @@ void install_exception_handler()
     previous_terminate_handler = std::set_terminate(handler);
   });
 }
-// deprecated
-void logException(e_xbt_log_priority_t priority, const char* context, std::exception const& exception)
-{
-  log_exception(priority, context, exception);
-}
-void installExceptionHandler()
-{
-  install_exception_handler();
-}
 
 } // namespace xbt
 } // namespace simgrid