X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f17b9a490a2fc481082483fce016d57605d429a0..fb4b94da324f0fc681cf6bde77ca28277e9cfa3e:/src/xbt/exception.cpp diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp index fe4c6b58a0..94130b30c2 100644 --- a/src/xbt/exception.cpp +++ b/src/xbt/exception.cpp @@ -90,9 +90,8 @@ void log_exception(e_xbt_log_priority_t prio, const char* context, std::exceptio // Do we have a backtrace? if (with_context != nullptr && not simgrid::config::get_value("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? @@ -121,10 +120,9 @@ static void show_backtrace(const simgrid::xbt::Backtrace& bt) XBT_LOG(xbt_log_priority_critical, "Display of current backtrace disabled by --cfg=exception/cutpath."); return; } - std::vector 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;