#include "src/internal_config.h"
-#include "simgrid/simix.h" /* SIMIX_process_self_get_name() */
#include <xbt/backtrace.hpp>
-#include <xbt/log.h>
#include <xbt/string.hpp>
#include <xbt/sysdep.h>
+#include <xbt/virtu.h>
#include <cstddef>
#include <cstdlib>
#include <cxxabi.h>
#endif
-#if HAVE_BOOST_STACKTRACE
+#if HAVE_BOOST_STACKTRACE_BACKTRACE
#define BOOST_STACKTRACE_USE_BACKTRACE
#include <boost/stacktrace.hpp>
+#elif HAVE_BOOST_STACKTRACE_ADDR2LINE
+#define BOOST_STACKTRACE_USE_ADDR2LINE
+#include <boost/stacktrace.hpp>
#endif
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_backtrace, xbt, "Backtrace");
-
/** @brief show the backtrace of the current point (lovely while debugging) */
void xbt_backtrace_display_current()
{
{
#ifdef __GXX_ABI_VERSION
int status;
- auto res = std::unique_ptr<char, std::function<void(char*)>>(abi::__cxa_demangle(name, nullptr, nullptr, &status),
- &std::free);
+ std::unique_ptr<char, std::function<void(char*)>> res(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:
return false;
}
}
-#if HAVE_BOOST_STACKTRACE
+#if HAVE_BOOST_STACKTRACE_BACKTRACE || HAVE_BOOST_STACKTRACE_ADDR2LINE
boost::stacktrace::stacktrace st;
#endif
};
Backtrace::Backtrace()
{
-#if HAVE_BOOST_STACKTRACE
+#if HAVE_BOOST_STACKTRACE_BACKTRACE || HAVE_BOOST_STACKTRACE_ADDR2LINE
impl_ = new BacktraceImpl();
impl_->st = boost::stacktrace::stacktrace();
#endif
}
-Backtrace::Backtrace(const Backtrace& bt)
+
+Backtrace::Backtrace(const Backtrace& bt) : impl_(bt.impl_)
{
- impl_ = bt.impl_;
if (impl_)
impl_->ref();
}
Backtrace::Backtrace(Backtrace&& bt)
{
- impl_ = bt.impl_;
- bt.impl_ = nullptr;
+ std::swap(impl_, bt.impl_);
}
Backtrace& Backtrace::operator=(const Backtrace& rhs)
{
std::string result("");
-#if HAVE_BOOST_STACKTRACE
+#if HAVE_BOOST_STACKTRACE_BACKTRACE || HAVE_BOOST_STACKTRACE_ADDR2LINE
std::stringstream ss;
ss << impl_->st;
result.append(ss.str());
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());
+ fprintf(stderr, "Backtrace (displayed in actor %s):\n", xbt_procname());
std::fprintf(stderr, "%s\n", backtrace.c_str());
}