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
Convert to C++, and call get_pid() directly.
[simgrid.git]
/
src
/
xbt
/
backtrace.cpp
diff --git
a/src/xbt/backtrace.cpp
b/src/xbt/backtrace.cpp
index
b9f4009
..
74126b1
100644
(file)
--- a/
src/xbt/backtrace.cpp
+++ b/
src/xbt/backtrace.cpp
@@
-5,11
+5,11
@@
#include "src/internal_config.h"
#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/backtrace.hpp>
#include <xbt/log.h>
#include <xbt/string.hpp>
#include <xbt/sysdep.h>
+#include <xbt/virtu.h>
#include <cstddef>
#include <cstdlib>
#include <cstddef>
#include <cstdlib>
@@
-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");
@@
-42,17
+45,18
@@
void xbt_backtrace_display_current()
namespace simgrid {
namespace xbt {
namespace simgrid {
namespace xbt {
-std::unique_ptr<char,
void(*)(void*)
> demangle(const char* name)
+std::unique_ptr<char,
std::function<void(char*)>
> demangle(const char* name)
{
#ifdef __GXX_ABI_VERSION
int status;
{
#ifdef __GXX_ABI_VERSION
int status;
- auto res = std::unique_ptr<char, void (*)(void*)>(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:
#endif
// Return the symbol:
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,
std::function<void(char*)>>(xbt_strdup(name), &xbt_free_f
);
}
class BacktraceImpl {
}
class BacktraceImpl {
@@
-63,16
+67,21
@@
public:
bool unref()
{
refcount_--;
bool unref()
{
refcount_--;
- return refcount_ == 0;
+ if (refcount_ == 0) {
+ delete this;
+ return true;
+ } else {
+ 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
@@
-92,31
+101,38
@@
Backtrace::Backtrace(Backtrace&& bt)
Backtrace& Backtrace::operator=(const Backtrace& rhs)
{
Backtrace& Backtrace::operator=(const Backtrace& rhs)
{
- impl_ = rhs.impl_;
- if (impl_)
- impl_->ref();
+ if (this != &rhs) {
+ if (impl_)
+ impl_->unref();
+ impl_ = rhs.impl_;
+ if (impl_)
+ impl_->ref();
+ }
return *this;
}
Backtrace& Backtrace::operator=(Backtrace&& rhs)
{
return *this;
}
Backtrace& Backtrace::operator=(Backtrace&& rhs)
{
- impl_ = rhs.impl_;
- rhs.impl_ = nullptr;
+ if (this != &rhs) {
+ if (impl_)
+ impl_->unref();
+ impl_ = rhs.impl_;
+ rhs.impl_ = nullptr;
+ }
return *this;
}
Backtrace::~Backtrace()
{
return *this;
}
Backtrace::~Backtrace()
{
- if (impl_ != nullptr && impl_->unref()) {
- delete impl_;
- }
+ if (impl_)
+ impl_->unref();
}
std::string const Backtrace::resolve() const
{
std::string result("");
}
std::string const Backtrace::resolve() const
{
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());
@@
-131,7
+147,7
@@
void Backtrace::display() const
fprintf(stderr, "(backtrace not set -- did you install Boost.Stacktrace?)\n");
return;
}
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_proc
name());
std::fprintf(stderr, "%s\n", backtrace.c_str());
}
std::fprintf(stderr, "%s\n", backtrace.c_str());
}