-/* Copyright (c) 2005-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2005-2021. 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 <xbt/config.hpp>
#include <xbt/log.hpp>
+#include <boost/core/demangle.hpp>
#include <mutex>
#include <sstream>
XBT_LOG_EXTERNAL_CATEGORY(xbt);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_exception, xbt, "Exceptions");
-void _xbt_throw(char* message, int value, const char* file, int line, const char* func)
+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 : "");
xbt_free(message);
- e.value = value;
throw e;
}
void log_exception(e_xbt_log_priority_t prio, const char* context, std::exception const& exception)
{
try {
- auto name = simgrid::xbt::demangle(typeid(exception).name());
+ std::string name = boost::core::demangle(typeid(exception).name());
auto* with_context = dynamic_cast<const simgrid::Exception*>(&exception);
if (with_context != nullptr) {
- XBT_LOG(prio, "%s %s by %s/%d: %s", context, name.get(), with_context->throw_point().procname_.c_str(),
+ XBT_LOG(prio, "%s %s by %s/%d: %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")) {
auto backtrace = with_context->resolve_backtrace();
- XBT_LOG(prio, " -> %s", backtrace.c_str());
+ XBT_LOG(prio, "Backtrace:\n%s", backtrace.c_str());
}
} else {
- XBT_LOG(prio, "%s %s: %s", context, name.get(), exception.what());
+ XBT_LOG(prio, "%s %s: %s", context, name.c_str(), exception.what());
}
} catch (...) {
// Don't log exceptions we got when trying to log exception
return;
}
std::string res = bt.resolve();
- XBT_CRITICAL("Current backtrace:");
- XBT_CRITICAL(" -> %s", res.c_str());
+ XBT_CRITICAL("Current backtrace:\n%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();
try {
- std::rethrow_exception(e);
+ std::rethrow_exception(std::current_exception());
}
// Parse error are handled differently, as the call stack does not matter, only the file location