-/* 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. */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_backtrace, xbt, "Backtrace");
-void xbt_backtrace_display(const simgrid::xbt::Backtrace& bt)
-{
- std::string backtrace = simgrid::xbt::resolve_backtrace(bt);
- if (backtrace.empty()) {
- fprintf(stderr, "(backtrace not set -- did you install Boost.Stacktrace?)\n");
- return;
- }
- fprintf(stderr, "Backtrace (displayed in actor %s):\n", SIMIX_process_self_get_name());
- std::fprintf(stderr, "%s\n", backtrace.c_str());
-}
-
/** @brief show the backtrace of the current point (lovely while debugging) */
void xbt_backtrace_display_current()
{
- simgrid::xbt::Backtrace bt = simgrid::xbt::Backtrace();
- xbt_backtrace_display(bt);
+ simgrid::xbt::Backtrace().display();
}
namespace simgrid {
{
#ifdef __GXX_ABI_VERSION
int status;
- auto res = std::unique_ptr<char, void(*)(void*)>(
- abi::__cxa_demangle(name, nullptr, nullptr, &status),
- std::free
- );
+ auto res = std::unique_ptr<char, void (*)(void*)>(abi::__cxa_demangle(name, nullptr, nullptr, &status), &std::free);
if (res != nullptr)
return res;
// We did not manage to resolve this. Probably because this is not a mangled symbol:
#endif
// Return the symbol:
- return std::unique_ptr<char, void(*)(void*)>(xbt_strdup(name), std::free);
+ return std::unique_ptr<char, void (*)(void*)>(xbt_strdup(name), &std::free);
}
class BacktraceImpl {
delete impl_;
}
}
-} // namespace xbt
-} // namespace simgrid
-namespace simgrid {
-namespace xbt {
-
-std::string resolve_backtrace(const Backtrace& bt)
+std::string const Backtrace::resolve() const
{
std::string result("");
#if HAVE_BOOST_STACKTRACE
std::stringstream ss;
- ss << bt.impl_->st;
+ ss << impl_->st;
result.append(ss.str());
#endif
return result;
}
+void Backtrace::display() const
+{
+ std::string backtrace = resolve();
+ if (backtrace.empty()) {
+ fprintf(stderr, "(backtrace not set -- did you install Boost.Stacktrace?)\n");
+ return;
+ }
+ fprintf(stderr, "Backtrace (displayed in actor %s):\n", SIMIX_process_self_get_name());
+ std::fprintf(stderr, "%s\n", backtrace.c_str());
+}
+
} // namespace xbt
} // namespace simgrid