X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc4eceb15c80a597e44222b8c0ff60caf85db959..5c14275ba09456406ec4b8bf1ef2ca76e18fb32e:/src/xbt/backtrace.cpp

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index b9f4009f05..5ed2b0a096 100644
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -5,11 +5,10 @@
 
 #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>
@@ -26,13 +25,14 @@
 #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()
 {
@@ -42,17 +42,18 @@ void xbt_backtrace_display_current()
 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;
-  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:
-  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 {
@@ -63,60 +64,71 @@ public:
   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()
 {
-#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)
 {
-  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)
 {
-  impl_     = rhs.impl_;
-  rhs.impl_ = nullptr;
+  if (this != &rhs) {
+    if (impl_)
+      impl_->unref();
+    impl_     = rhs.impl_;
+    rhs.impl_ = nullptr;
+  }
   return *this;
 }
 
 Backtrace::~Backtrace()
 {
-  if (impl_ != nullptr && impl_->unref()) {
-    delete impl_;
-  }
+  if (impl_)
+    impl_->unref();
 }
 
 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());
@@ -131,7 +143,7 @@ void Backtrace::display() const
     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());
 }