A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
xbt
/
exception.cpp
diff --git
a/src/xbt/exception.cpp
b/src/xbt/exception.cpp
index
48c4dfa
..
41db24d
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"
* 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>
#include <xbt/config.hpp>
#include <xbt/log.hpp>
@@
-29,12
+30,6
@@
void _xbt_throw(char* message, xbt_errcat_t errcat, int value, const char* file,
throw e;
}
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)
{
/** @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";
}
default:
return "INVALID ERROR";
}
- return "INVALID ERROR";
}
namespace simgrid {
}
namespace simgrid {
@@
-151,6
+145,13
@@
static void handler()
std::abort();
}
std::abort();
}
+ catch (simgrid::ForcefulKillException const& e) {
+ 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
// We don't know how to manage other exceptions
catch (...) {
// If there was another handler let's delegate to it
@@
-162,7
+163,6
@@
static void handler()
std::abort();
}
}
std::abort();
}
}
-
}
void install_exception_handler()
}
void install_exception_handler()