-/* Copyright (c) 2005-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2005-2023. 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. */
void _xbt_throw(char* message, const char* file, int line, const char* func)
{
- simgrid::Exception e(
- simgrid::xbt::ThrowPoint(file, line, func, simgrid::xbt::Backtrace(), xbt_procname(), xbt_getpid()),
- message ? message : "");
+ simgrid::Exception e(simgrid::xbt::ThrowPoint(file, line, func, simgrid::xbt::Backtrace(), sg_actor_self_get_name(),
+ sg_actor_self_get_pid()),
+ message ? message : "");
xbt_free(message);
throw e;
}
-namespace simgrid {
-namespace xbt {
+namespace simgrid::xbt {
ImpossibleError::~ImpossibleError() = default;
InitializationError::~InitializationError() = default;
auto* with_context = dynamic_cast<const simgrid::Exception*>(&exception);
if (with_context != nullptr) {
- XBT_LOG(prio, "%s %s by %s/%d: %s", context, name.c_str(), with_context->throw_point().procname_.c_str(),
+ XBT_LOG(prio, "%s %s by %s/%ld: %s", context, name.c_str(), with_context->throw_point().procname_.c_str(),
with_context->throw_point().pid_, exception.what());
// Do we have a backtrace?
if (not simgrid::config::get_value<bool>("exception/cutpath")) {
XBT_ATTRIB_NORETURN static void handler()
{
// 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()) {
+ if (static std::atomic_flag lock = ATOMIC_FLAG_INIT; lock.test_and_set()) {
XBT_ERROR("Handling an exception raised an exception. Bailing out.");
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?");
+ XBT_ERROR("Received a ForcefulKillException at the top-level exception handler. Please help fix this bug.");
}
// We don't know how to manage other exceptions
});
}
-} // namespace xbt
-} // namespace simgrid
+} // namespace simgrid::xbt
void xbt_throw_impossible(const char* file, int line, const char* func)
{