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
Objectify MSG task send
[simgrid.git]
/
src
/
xbt
/
backtrace.cpp
diff --git
a/src/xbt/backtrace.cpp
b/src/xbt/backtrace.cpp
index
2be0a6c
..
600b7e8
100644
(file)
--- a/
src/xbt/backtrace.cpp
+++ b/
src/xbt/backtrace.cpp
@@
-46,16
+46,13
@@
std::unique_ptr<char, void(*)(void*)> demangle(const char* name)
{
#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 {
@@
-66,7
+63,12
@@
public:
bool unref()
{
refcount_--;
- return refcount_ == 0;
+ if (refcount_ == 0) {
+ delete this;
+ return true;
+ } else {
+ return false;
+ }
}
#if HAVE_BOOST_STACKTRACE
boost::stacktrace::stacktrace st;
@@
-87,11
+89,39
@@
Backtrace::Backtrace(const Backtrace& bt)
impl_->ref();
}
-Backtrace::~Backtrace()
+Backtrace::Backtrace(Backtrace&& bt)
+{
+ impl_ = bt.impl_;
+ bt.impl_ = nullptr;
+}
+
+Backtrace& Backtrace::operator=(const Backtrace& rhs)
{
- if (impl_ != nullptr && impl_->unref()) {
- delete impl_;
+ if (this != &rhs) {
+ if (impl_)
+ impl_->unref();
+ impl_ = rhs.impl_;
+ if (impl_)
+ impl_->ref();
}
+ return *this;
+}
+
+Backtrace& Backtrace::operator=(Backtrace&& rhs)
+{
+ if (this != &rhs) {
+ if (impl_)
+ impl_->unref();
+ impl_ = rhs.impl_;
+ rhs.impl_ = nullptr;
+ }
+ return *this;
+}
+
+Backtrace::~Backtrace()
+{
+ if (impl_)
+ impl_->unref();
}
std::string const Backtrace::resolve() const