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
Host is not null here (for scan-build).
[simgrid.git]
/
src
/
xbt
/
exception.cpp
diff --git
a/src/xbt/exception.cpp
b/src/xbt/exception.cpp
index
c89f325
..
8879309
100644
(file)
--- a/
src/xbt/exception.cpp
+++ b/
src/xbt/exception.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2005-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2005-20
20
. 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. */
/* 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. */
@@
-27,8
+27,9
@@
void _xbt_throw(char* message, int value, const char* file, int line, const char
namespace simgrid {
namespace xbt {
namespace simgrid {
namespace xbt {
-ImpossibleError::~ImpossibleError() = default;
-UnimplementedError::~UnimplementedError() = default;
+ImpossibleError::~ImpossibleError() = default;
+InitializationError::~InitializationError() = default;
+UnimplementedError::~UnimplementedError() = default;
void log_exception(e_xbt_log_priority_t prio, const char* context, std::exception const& exception)
{
void log_exception(e_xbt_log_priority_t prio, const char* context, std::exception const& exception)
{
@@
-54,8
+55,7
@@
void log_exception(e_xbt_log_priority_t prio, const char* context, std::exceptio
return;
try {
with_nested->rethrow_nested();
return;
try {
with_nested->rethrow_nested();
- }
- catch (std::exception& nested_exception) {
+ } catch (const std::exception& nested_exception) {
log_exception(prio, "Caused by", nested_exception);
}
// We could catch nested_exception or WithContextException but we don't bother:
log_exception(prio, "Caused by", nested_exception);
}
// We could catch nested_exception or WithContextException but we don't bother:
@@
-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,8
+98,15
@@
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 (const simgrid::ParseError& e) {
+ XBT_ERROR("%s", e.what());
+ XBT_ERROR("Exiting now.");
+ std::abort();
+ }
+
// We manage C++ exception ourselves
// We manage C++ exception ourselves
- catch (std::exception& e) {
+ catch (
const
std::exception& e) {
log_exception(xbt_log_priority_critical, "Uncaught exception", e);
show_backtrace(bt);
std::abort();
log_exception(xbt_log_priority_critical, "Uncaught exception", e);
show_backtrace(bt);
std::abort();
@@
-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()