A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use addr2line as a fallback for stacktraces when backtrace is not available
[simgrid.git]
/
src
/
xbt
/
backtrace.cpp
diff --git
a/src/xbt/backtrace.cpp
b/src/xbt/backtrace.cpp
index
837062a
..
a7c8585
100644
(file)
--- a/
src/xbt/backtrace.cpp
+++ b/
src/xbt/backtrace.cpp
@@
-26,9
+26,12
@@
#include <cxxabi.h>
#endif
#include <cxxabi.h>
#endif
-#if HAVE_BOOST_STACKTRACE
+#if HAVE_BOOST_STACKTRACE
_BACKTRACE
#define BOOST_STACKTRACE_USE_BACKTRACE
#include <boost/stacktrace.hpp>
#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");
#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_backtrace, xbt, "Backtrace");
@@
-71,14
+74,14
@@
public:
return false;
}
}
return false;
}
}
-#if HAVE_BOOST_STACKTRACE
+#if HAVE_BOOST_STACKTRACE
_BACKTRACE || HAVE_BOOST_STACKTRACE_ADDR2LINE
boost::stacktrace::stacktrace st;
#endif
};
Backtrace::Backtrace()
{
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
impl_ = new BacktraceImpl();
impl_->st = boost::stacktrace::stacktrace();
#endif
@@
-129,7
+132,7
@@
std::string const Backtrace::resolve() const
{
std::string result("");
{
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());
std::stringstream ss;
ss << impl_->st;
result.append(ss.str());