-/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2005-2019. 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"
+#include "src/kernel/context/Context.hpp"
#include <xbt/config.hpp>
#include <xbt/log.hpp>
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::backtrace(), xbt_procname(), xbt_getpid()),
+ xbt_ex e(simgrid::xbt::ThrowPoint(file, line, func, simgrid::xbt::Backtrace(), xbt_procname(), xbt_getpid()),
message);
xbt_free(message);
e.category = errcat;
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)
{
// 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_);
- 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?
XBT_LOG(xbt_log_priority_critical, "Display of current backtrace disabled by --cfg=exception/cutpath.");
return;
}
- std::vector<std::string> res = resolve_backtrace(bt);
+ std::string res = bt.resolve();
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;
// Get the current backtrace and exception
auto e = std::current_exception();
- simgrid::xbt::Backtrace bt = simgrid::xbt::backtrace();
+ simgrid::xbt::Backtrace bt = simgrid::xbt::Backtrace();
try {
std::rethrow_exception(e);
}
std::abort();
}
+ catch (simgrid::kernel::context::StopRequest& e) {
+ XBT_ERROR("Received a StopRequest 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
std::abort();
}
}
-
}
void install_exception_handler()