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

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index 743f0a4d4f..349ed1163b 100644
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -1,130 +1,82 @@
-/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2020. 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. */
 
 #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 <cstdio>
 #include <cstdlib>
-#include <cstring>
-#include <fstream>
 #include <sstream>
-#include <sys/stat.h>
-#include <vector>
-
-#include <boost/algorithm/string.hpp>
 
 // Try to detect and use the C++ itanium ABI for name demangling:
 #ifdef __GXX_ABI_VERSION
 #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");
-
-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 {
 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 {
-  short refcount_ = 1;
-
+#if HAVE_BOOST_STACKTRACE_BACKTRACE || HAVE_BOOST_STACKTRACE_ADDR2LINE
+  const boost::stacktrace::stacktrace st = boost::stacktrace::stacktrace();
+#else
+  const char st[1] = ""; // fallback value
+#endif
 public:
-  void ref() { refcount_++; }
-  bool unref()
+  std::string resolve() const
   {
-    refcount_--;
-    return refcount_ == 0;
+    std::stringstream ss;
+    ss << st;
+    return ss.str();
   }
-#if HAVE_BOOST_STACKTRACE
-  boost::stacktrace::stacktrace st;
-#endif
 };
 
-Backtrace::Backtrace()
-{
-#if HAVE_BOOST_STACKTRACE
-  impl_     = new BacktraceImpl();
-  impl_->st = boost::stacktrace::stacktrace();
-#endif
-}
-Backtrace::Backtrace(const Backtrace& bt)
-{
-  impl_ = bt.impl_;
-  impl_->ref();
-}
+Backtrace::Backtrace() : impl_(std::make_shared<BacktraceImpl>()) {}
 
-Backtrace::~Backtrace()
+std::string Backtrace::resolve() const
 {
-  if (impl_ != nullptr && impl_->unref()) {
-    delete impl_;
-  }
+  return impl_->resolve();
 }
-} // namespace xbt
-} // namespace simgrid
-
-namespace simgrid {
-namespace xbt {
 
-std::string resolve_backtrace(const Backtrace& bt)
+void Backtrace::display() const
 {
-  std::string result("");
-
-#if HAVE_BOOST_STACKTRACE
-  std::stringstream ss;
-  ss << bt.impl_->st;
-  result.append(ss.str());
-#endif
-  return result;
+  std::string backtrace = resolve();
+  std::fprintf(stderr, "Backtrace (displayed in actor %s):\n%s\n", xbt_procname(),
+               backtrace.empty() ? "(backtrace not set -- did you install Boost.Stacktrace?)" : backtrace.c_str());
 }
 
 } // namespace xbt