-/* 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>
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_);
+ auto backtrace = with_context->resolve_backtrace();
XBT_LOG(prio, " -> %s", backtrace.c_str());
}
XBT_LOG(xbt_log_priority_critical, "Display of current backtrace disabled by --cfg=exception/cutpath.");
return;
}
- std::string res = resolve_backtrace(bt);
+ std::string res = bt.resolve();
XBT_LOG(xbt_log_priority_critical, "Current backtrace:");
XBT_LOG(xbt_log_priority_critical, " -> %s", res.c_str());
}
std::abort();
}
+ catch (simgrid::kernel::context::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()