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

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index 743f0a4d4f..b9f4009f05 100644
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -33,27 +33,10 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_backtrace, xbt, "Backtrace");
 
-static bool startWith(std::string str, const char* prefix)
-{
-  return strncmp(str.c_str(), prefix, strlen(prefix)) == 0;
-}
-
-void xbt_backtrace_display(const simgrid::xbt::Backtrace& bt)
-{
-  std::string backtrace = simgrid::xbt::resolve_backtrace(bt);
-  if (backtrace.empty()) {
-    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());
-  std::fprintf(stderr, "%s\n", backtrace.c_str());
-}
-
 /** @brief show the backtrace of the current point (lovely while debugging) */
 void xbt_backtrace_display_current()
 {
-  simgrid::xbt::Backtrace bt = simgrid::xbt::Backtrace();
-  xbt_backtrace_display(bt);
+  simgrid::xbt::Backtrace().display();
 }
 
 namespace simgrid {
@@ -63,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 {
@@ -100,7 +80,29 @@ Backtrace::Backtrace()
 Backtrace::Backtrace(const Backtrace& bt)
 {
   impl_ = bt.impl_;
-  impl_->ref();
+  if (impl_)
+    impl_->ref();
+}
+
+Backtrace::Backtrace(Backtrace&& bt)
+{
+  impl_    = bt.impl_;
+  bt.impl_ = nullptr;
+}
+
+Backtrace& Backtrace::operator=(const Backtrace& rhs)
+{
+  impl_ = rhs.impl_;
+  if (impl_)
+    impl_->ref();
+  return *this;
+}
+
+Backtrace& Backtrace::operator=(Backtrace&& rhs)
+{
+  impl_     = rhs.impl_;
+  rhs.impl_ = nullptr;
+  return *this;
 }
 
 Backtrace::~Backtrace()
@@ -109,23 +111,29 @@ Backtrace::~Backtrace()
     delete impl_;
   }
 }
-} // namespace xbt
-} // namespace simgrid
 
-namespace simgrid {
-namespace xbt {
-
-std::string resolve_backtrace(const Backtrace& bt)
+std::string const Backtrace::resolve() const
 {
   std::string result("");
 
 #if HAVE_BOOST_STACKTRACE
   std::stringstream ss;
-  ss << bt.impl_->st;
+  ss << impl_->st;
   result.append(ss.str());
 #endif
   return result;
 }
 
+void Backtrace::display() const
+{
+  std::string backtrace = resolve();
+  if (backtrace.empty()) {
+    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());
+  std::fprintf(stderr, "%s\n", backtrace.c_str());
+}
+
 } // namespace xbt
 } // namespace simgrid