Add "override" specifier.

[simgrid.git] / src / xbt / exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index efb2c60..beec1e4 100644 (file)
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -4,6 +4,7 @@
  * 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>
 
@@ -64,7 +65,6 @@ const char* xbt_ex_catname(xbt_errcat_t cat)
     default:
       return "INVALID ERROR";
   }
-  return "INVALID ERROR";
 }
 
 namespace simgrid {
@@ -145,6 +145,13 @@ static void handler()
     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
@@ -156,7 +163,6 @@ static void handler()
       std::abort();
     }
   }
-
 }
 
 void install_exception_handler()
@@ -166,15 +172,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