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

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index b9f4009f05..35122fbc64 100644
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -1,38 +1,35 @@
-/* Copyright (c) 2005-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2021. 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 <boost/algorithm/string/predicate.hpp>
+#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>
+#include <boost/stacktrace/detail/frame_decl.hpp>
+#elif HAVE_BOOST_STACKTRACE_ADDR2LINE
+#define BOOST_STACKTRACE_USE_ADDR2LINE
+#include <boost/stacktrace.hpp>
+#include <boost/stacktrace/detail/frame_decl.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,97 +39,68 @@ 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 {
-  short refcount_ = 1;
+#if HAVE_BOOST_STACKTRACE_BACKTRACE || HAVE_BOOST_STACKTRACE_ADDR2LINE
+  const boost::stacktrace::stacktrace st;
 
 public:
-  void ref() { refcount_++; }
-  bool unref()
+  std::string resolve() const
   {
-    refcount_--;
-    return refcount_ == 0;
+    std::stringstream ss;
+
+    int frame_count = 0;
+    int state       = 0;
+
+    for (boost::stacktrace::frame frame : st) {
+      if (state == 1) {
+        if (boost::starts_with(frame.name(), "simgrid::xbt::MainFunction") ||
+            boost::starts_with(frame.name(), "simgrid::kernel::context::Context::operator()()"))
+          break;
+        ss << "  ->  " << frame_count++ << "# " << frame.name() << " at " << frame.source_file() << ":"
+           << frame.source_line() << std::endl;
+        if (frame.name() == "main")
+          break;
+      } else {
+        if (frame.name() == "simgrid::xbt::Backtrace::Backtrace()")
+          state = 1;
+      }
+    }
+
+    return ss.str();
   }
-#if HAVE_BOOST_STACKTRACE
-  boost::stacktrace::stacktrace st;
-#endif
-};
+#else
 
-Backtrace::Backtrace()
-{
-#if HAVE_BOOST_STACKTRACE
-  impl_     = new BacktraceImpl();
-  impl_->st = boost::stacktrace::stacktrace();
+public:
+  std::string resolve() const { return ""; } // fallback value
 #endif
-}
-Backtrace::Backtrace(const Backtrace& bt)
-{
-  impl_ = bt.impl_;
-  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() : impl_(std::make_shared<BacktraceImpl>()) {}
 
-Backtrace& Backtrace::operator=(Backtrace&& rhs)
+std::string Backtrace::resolve() const
 {
-  impl_     = rhs.impl_;
-  rhs.impl_ = nullptr;
-  return *this;
-}
-
-Backtrace::~Backtrace()
-{
-  if (impl_ != nullptr && impl_->unref()) {
-    delete impl_;
-  }
-}
-
-std::string const Backtrace::resolve() const
-{
-  std::string result("");
-
-#if HAVE_BOOST_STACKTRACE
-  std::stringstream ss;
-  ss << impl_->st;
-  result.append(ss.str());
-#endif
-  return result;
+  return impl_->resolve();
 }
 
 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());
+  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