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
Revise to fool cppcheck.
[simgrid.git]
/
src
/
xbt
/
exception.cpp
diff --git
a/src/xbt/exception.cpp
b/src/xbt/exception.cpp
index
0a0f335
..
82b64ee
100644
(file)
--- a/
src/xbt/exception.cpp
+++ b/
src/xbt/exception.cpp
@@
-1,9
+1,10
@@
-/* Copyright (c) 2005-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2005-201
9
. 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"
/* 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>
#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)
{
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::
b
acktrace(), xbt_procname(), xbt_getpid()),
+ xbt_ex e(simgrid::xbt::ThrowPoint(file, line, func, simgrid::xbt::
B
acktrace(), xbt_procname(), xbt_getpid()),
message);
xbt_free(message);
e.category = errcat;
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;
}
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 {
@@
-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")) {
// 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?
}
// Do we have a nested exception?
@@
-116,16
+108,15
@@
void log_exception(e_xbt_log_priority_t prio, const char* context, std::exceptio
}
}
}
}
-static void show
Backtrace(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.");
return;
}
{
if (simgrid::config::get_value<bool>("exception/cutpath")) {
XBT_LOG(xbt_log_priority_critical, "Display of current backtrace disabled by --cfg=exception/cutpath.");
return;
}
- std::
vector<std::string> res = resolve_backtrace(&bt[0], bt.size()
);
+ std::
string res = bt.resolve(
);
XBT_LOG(xbt_log_priority_critical, "Current backtrace:");
XBT_LOG(xbt_log_priority_critical, "Current backtrace:");
- for (std::string const& s : res)
- XBT_LOG(xbt_log_priority_critical, " -> %s", s.c_str());
+ XBT_LOG(xbt_log_priority_critical, " -> %s", res.c_str());
}
static std::terminate_handler previous_terminate_handler = nullptr;
}
static std::terminate_handler previous_terminate_handler = nullptr;
@@
-142,7
+133,7
@@
static void handler()
// Get the current backtrace and exception
auto e = std::current_exception();
// Get the current backtrace and exception
auto e = std::current_exception();
-
auto bt = b
acktrace();
+
simgrid::xbt::Backtrace bt = simgrid::xbt::B
acktrace();
try {
std::rethrow_exception(e);
}
try {
std::rethrow_exception(e);
}
@@
-150,10
+141,17
@@
static void handler()
// 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);
- show
B
acktrace(bt);
+ show
_b
acktrace(bt);
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
@@
-161,11
+159,10
@@
static void handler()
previous_terminate_handler();
else {
XBT_ERROR("Unknown uncaught exception");
previous_terminate_handler();
else {
XBT_ERROR("Unknown uncaught exception");
- show
B
acktrace(bt);
+ show
_b
acktrace(bt);
std::abort();
}
}
std::abort();
}
}
-
}
void install_exception_handler()
}
void install_exception_handler()
@@
-175,15
+172,6
@@
void install_exception_handler()
previous_terminate_handler = std::set_terminate(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
} // namespace xbt
} // namespace simgrid