X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/931c72e9293d64a1797a6187dd0e744408c23d59..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/xbt/backtrace.cpp

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index 669856acda..022ae52a55 100644
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -1,10 +1,11 @@
-/* Copyright (c) 2005-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2017. 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 <cstddef>
 #include <cstdlib>
+#include <cstring>
 
 #include <vector>
 
@@ -13,6 +14,7 @@
 #include <cxxabi.h>
 #endif
 
+#include "simgrid/simix.h" /* SIMIX_process_self_get_name() */
 #include <xbt/backtrace.h>
 #include <xbt/backtrace.hpp>
 #include <xbt/log.h>
@@ -26,8 +28,36 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_backtrace, xbt, "Backtrace");
 
 }
 
-/** @brief show the backtrace of the current point (lovely while debuging) */
-void xbt_backtrace_display_current(void)
+static bool startWith(std::string str, const char* prefix)
+{
+  return strncmp(str.c_str(), prefix, strlen(prefix)) == 0;
+}
+
+void xbt_backtrace_display(xbt_backtrace_location_t* loc, std::size_t count)
+{
+#ifdef HAVE_BACKTRACE
+  std::vector<std::string> backtrace = simgrid::xbt::resolveBacktrace(loc, count);
+  if (backtrace.empty()) {
+    fprintf(stderr, "(backtrace not set)\n");
+    return;
+  }
+  fprintf(stderr, "Backtrace (displayed in process %s):\n", SIMIX_process_self_get_name());
+  for (std::string const& s : backtrace) {
+    if (startWith(s, "xbt_backtrace_display_current"))
+      continue;
+
+    std::fprintf(stderr, "---> '%s'\n", s.c_str());
+    if (startWith(s, "SIMIX_simcall_handle") ||
+        startWith(s, "simgrid::xbt::MainFunction") /* main used with thread factory */)
+      break;
+  }
+#else
+  XBT_ERROR("Cannot display backtrace when compiled without libunwind.");
+#endif
+}
+
+/** @brief show the backtrace of the current point (lovely while debugging) */
+void xbt_backtrace_display_current()
 {
   const std::size_t size = 10;
   xbt_backtrace_location_t bt[size];
@@ -43,13 +73,12 @@ 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, NULL, NULL, &status),
+    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:
+  // 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);