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
Modifying how uniform integer are generated
[simgrid.git]
/
src
/
xbt
/
exception.cpp
diff --git
a/src/xbt/exception.cpp
b/src/xbt/exception.cpp
index
94661db
..
7e4366a
100644
(file)
--- a/
src/xbt/exception.cpp
+++ b/
src/xbt/exception.cpp
@@
-84,8
+84,7
@@
static std::terminate_handler previous_terminate_handler = nullptr;
static void handler()
{
static void handler()
{
- // Avoid doing crazy things if we get an uncaught exception inside
- // an uncaught exception
+ // Avoid doing crazy things if we get an uncaught exception inside an uncaught exception
static std::atomic_flag lock = ATOMIC_FLAG_INIT;
if (lock.test_and_set()) {
XBT_ERROR("Handling an exception raised an exception. Bailing out.");
static std::atomic_flag lock = ATOMIC_FLAG_INIT;
if (lock.test_and_set()) {
XBT_ERROR("Handling an exception raised an exception. Bailing out.");
@@
-99,6
+98,13
@@
static void handler()
std::rethrow_exception(e);
}
std::rethrow_exception(e);
}
+ // Parse error are handled differently, as the call stack does not matter, only the file location
+ catch (simgrid::ParseError& e) {
+ XBT_ERROR("%s", e.what());
+ XBT_ERROR("Exiting now.");
+ std::abort();
+ }
+
// We manage C++ exception ourselves
catch (std::exception& e) {
log_exception(xbt_log_priority_critical, "Uncaught exception", e);
// We manage C++ exception ourselves
catch (std::exception& e) {
log_exception(xbt_log_priority_critical, "Uncaught exception", e);
@@
-108,8
+114,7
@@
static void handler()
catch (const simgrid::ForcefulKillException&) {
XBT_ERROR("Received a ForcefulKillException at the top-level exception handler. Maybe a Java->C++ call that is not "
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?");
+ "protected in a try/catch?");
show_backtrace(bt);
}
show_backtrace(bt);
}
@@
-124,6
+129,7
@@
static void handler()
std::abort();
}
}
std::abort();
}
}
+ XBT_INFO("BAM");
}
void install_exception_handler()
}
void install_exception_handler()
@@
-140,7
+146,8
@@
void install_exception_handler()
void xbt_throw_impossible(const char* file, int line, const char* func)
{
std::stringstream ss;
void xbt_throw_impossible(const char* file, int line, const char* func)
{
std::stringstream ss;
- ss << file << ":" << line << ":" << func << ": The Impossible Did Happen (yet again). Please report this bug.";
+ ss << file << ":" << line << ":" << func
+ << ": The Impossible Did Happen (yet again). Please report this bug (after reading https://xkcd.com/2200 :)";
throw simgrid::xbt::ImpossibleError(ss.str());
}
void xbt_throw_unimplemented(const char* file, int line, const char* func)
throw simgrid::xbt::ImpossibleError(ss.str());
}
void xbt_throw_unimplemented(const char* file, int line, const char* func)