X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f..a8a66c743439c94d5de5bcb8a3e50dcd207b6d2f:/src/xbt/backtrace.cpp

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index 693ef556ab..a180720217 100644
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2022. 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. */
@@ -14,17 +14,14 @@
 #include <cstdlib>
 #include <sstream>
 
-// Try to detect and use the C++ itanium ABI for name demangling:
-#ifdef __GXX_ABI_VERSION
-#include <cxxabi.h>
-#endif
-
 #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
 
 /** @brief show the backtrace of the current point (lovely while debugging) */
@@ -33,34 +30,53 @@ void xbt_backtrace_display_current()
   simgrid::xbt::Backtrace().display();
 }
 
-namespace simgrid {
-namespace xbt {
-
-std::unique_ptr<char, std::function<void(char*)>> demangle(const char* name)
-{
-#ifdef __GXX_ABI_VERSION
-  int status;
-  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, std::function<void(char*)>>(xbt_strdup(name), &xbt_free_f);
-}
+namespace simgrid::xbt {
 
 class BacktraceImpl {
 #if HAVE_BOOST_STACKTRACE_BACKTRACE || HAVE_BOOST_STACKTRACE_ADDR2LINE
-  const boost::stacktrace::stacktrace st = boost::stacktrace::stacktrace();
+  const boost::stacktrace::stacktrace st;
+
 public:
   std::string resolve() const
   {
     std::stringstream ss;
-    ss << st;
+
+    int frame_count = 0;
+    bool print      = false;
+
+    for (boost::stacktrace::frame const& frame : st) {
+      const std::string frame_name = frame.name();
+      if (print) {
+        if (frame_name.rfind("simgrid::xbt::MainFunction", 0) == 0 ||
+            frame_name.rfind("simgrid::kernel::context::Context::operator()()", 0) == 0)
+          break;
+        if (xbt_log_no_loc) { // Don't display file source and line if so
+          if (frame.name().empty())
+            ss << "  ->  #" << frame_count++ << " (debug info not found and log:no_loc activated)\n";
+          else
+            ss << "  ->  #" << frame_count++ << " " << frame.name() << "\n";
+        } else
+          ss << "  ->  #" << frame_count++ << " " << frame << "\n";
+        // If we are displaying the user side of a simcall, remove the crude details of context switching
+        if (frame_name.find("simgrid::kernel::actor::simcall_answered") != std::string::npos ||
+            frame_name.find("simgrid::kernel::actor::simcall_blocking") != std::string::npos ||
+            frame_name.find("simcall_run_answered") != std::string::npos ||
+            frame_name.find("simcall_run_blocking") != std::string::npos) {
+          frame_count = 0;
+          ss.str(std::string()); // This is how you clear a stringstream in C++. clear() is something else :'(
+        }
+        if (frame_name == "main")
+          break;
+      } else {
+        if (frame_name == "simgrid::xbt::Backtrace::Backtrace()")
+          print = true;
+      }
+    }
+
     return ss.str();
   }
 #else
+
 public:
   std::string resolve() const { return ""; } // fallback value
 #endif
@@ -76,9 +92,9 @@ std::string Backtrace::resolve() const
 void Backtrace::display() const
 {
   std::string backtrace = resolve();
-  std::fprintf(stderr, "Backtrace (displayed in actor %s):\n%s\n", xbt_procname(),
+  std::fprintf(stderr, "Backtrace (displayed in actor %s%s):\n%s\n", xbt_procname(),
+               (xbt_log_no_loc ? " -- short trace because of --log=no_loc" : ""),
                backtrace.empty() ? "(backtrace not set -- did you install Boost.Stacktrace?)" : backtrace.c_str());
 }
 
-} // namespace xbt
-} // namespace simgrid
+} // namespace simgrid::xbt