-/* 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)
{
default:
return "INVALID ERROR";
}
- return "INVALID ERROR";
}
namespace simgrid {
}
catch (...) {
// Don't log exceptions we got when trying to log exception
+ XBT_LOG(prio, "Ignoring exception caught while while trying to log an exception!");
}
}
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.");
+ XBT_CRITICAL("Display of current backtrace disabled by --cfg=exception/cutpath.");
return;
}
std::string res = bt.resolve();
- XBT_LOG(xbt_log_priority_critical, "Current backtrace:");
- XBT_LOG(xbt_log_priority_critical, " -> %s", res.c_str());
+ XBT_CRITICAL("Current backtrace:");
+ XBT_CRITICAL(" -> %s", res.c_str());
}
static std::terminate_handler previous_terminate_handler = nullptr;
std::abort();
}
+ 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?");
+ 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()
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