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

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index a7c85854b4..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>
@@ -34,8 +33,6 @@
 #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()
 {
@@ -86,17 +83,16 @@ Backtrace::Backtrace()
   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)
@@ -147,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());
 }