X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/73cb8b667ab57c2c5ed97a066454d3cb4a4e36cf..05736ee0ede974fcf9fb60a13a40c50d62fcc19d:/src/xbt/backtrace_linux.cpp

diff --git a/src/xbt/backtrace_linux.cpp b/src/xbt/backtrace_linux.cpp
index 19b15ab5d2..e3ec64071d 100644
--- a/src/xbt/backtrace_linux.cpp
+++ b/src/xbt/backtrace_linux.cpp
@@ -1,7 +1,7 @@
 /* backtrace_linux - backtrace displaying on linux platform                 */
 /* This file is included by ex.cpp on need (have execinfo.h, popen & addrline)*/
 
-/* Copyright (c) 2008-2015. The SimGrid Team.
+/* Copyright (c) 2008-2016. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -19,6 +19,7 @@
 
 /* This file is to be included in ex.cpp, so the following headers are not mandatory, but it's to make sure that eclipse see them too */
 #include <xbt/string.hpp>
+#include <xbt/backtrace.hpp>
 #include "xbt/ex.h"
 #include "src/xbt/ex_interface.h"
 #include "xbt/log.h"
@@ -33,15 +34,6 @@
 
 extern char **environ;          /* the environment, as specified by the opengroup */
 
-/* Module creation/destruction: nothing to do on linux */
-void xbt_backtrace_preinit(void)
-{
-}
-
-void xbt_backtrace_postexit(void)
-{
-}
-
 #include <unwind.h>
 struct trace_arg {
   void **array;
@@ -70,14 +62,14 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
 
 /** @brief reimplementation of glibc backtrace based directly on gcc library, without implicit malloc
  *
- * See http://webloria.loria.fr/~quinson/blog/2012/0208/system_programming_fun_in_SimGrid/
+ * See http://people.irisa.fr/Martin.Quinson/blog/2012/0208/system_programming_fun_in_SimGrid/
  * for the motivation behind this function
  * */
 
 int xbt_backtrace_no_malloc(void **array, int size) {
   int i = 0;
   for(i=0; i < size; i++)
-    array[i] = NULL;
+    array[i] = nullptr;
 
   struct trace_arg arg;
   arg .array = array;
@@ -87,9 +79,9 @@ int xbt_backtrace_no_malloc(void **array, int size) {
   if (size >= 1)
     _Unwind_Backtrace(backtrace_helper, &arg);
 
-  /* _Unwind_Backtrace on IA-64 seems to put NULL address above
+  /* _Unwind_Backtrace on IA-64 seems to put nullptr address above
      _start.  Fix it up here.  */
-  if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL)
+  if (arg.cnt > 1 && arg.array[arg.cnt - 1] == nullptr)
     --arg.cnt;
   return arg.cnt != -1 ? arg.cnt : 0;
 }
@@ -114,6 +106,9 @@ static std::string get_binary_path()
 {
   struct stat stat_buf;
 
+  if (xbt_binary_name == nullptr)
+    return "";
+
   // We found it, we are happy:
   if (stat(xbt_binary_name, &stat_buf) == 0)
     return xbt_binary_name;
@@ -144,23 +139,28 @@ static std::string get_binary_path()
 //FIXME: This code could be greatly improved/simplifyied with
 //   http://cairo.sourcearchive.com/documentation/1.9.4/backtrace-symbols_8c-source.html
 std::vector<std::string> resolveBacktrace(
-  xbt_backtrace_location_t* loc, std::size_t count)
+  xbt_backtrace_location_t const* loc, std::size_t count)
 {
   std::vector<std::string> result;
 
-  /* no binary name, nothing to do */
-  if (xbt_binary_name == NULL)
-    return result;
-
   if (count == 0)
     return result;
 
+  if (xbt_binary_name == nullptr)
+    XBT_WARN("XBT not initialized, the backtrace will not be resolved.");
+
   // Drop the first one:
   loc++; count--;
 
   char** backtrace_syms = backtrace_symbols(loc, count);
   std::string binary_name = get_binary_path();
 
+  if (binary_name.empty()) {
+    for (std::size_t i = 0; i < count; i++)
+      result.push_back(simgrid::xbt::string_printf("%p", loc[i]));
+    return result;
+  }
+
   // Create the system command for add2line:
   std::ostringstream stream;
   stream << ADDR2LINE << " -f -e " << binary_name << ' ';
@@ -209,9 +209,10 @@ std::vector<std::string> resolveBacktrace(
     }
 
     if (strcmp("??", line_func) != 0) {
-      XBT_DEBUG("Found static symbol %s() at %s", line_func, line_pos);
+      auto name = simgrid::xbt::demangle(line_func);
+      XBT_DEBUG("Found static symbol %s at %s", name.get(), line_pos);
       result.push_back(simgrid::xbt::string_printf(
-        "%s() at %s", line_func, line_pos
+        "%s at %s, %p", name.get(), line_pos, loc[i]
       ));
     } else {
       /* Damn. The symbol is in a dynamic library. Let's get wild */
@@ -236,7 +237,7 @@ std::vector<std::string> resolveBacktrace(
       while (!found) {
         long int first, last;
 
-        if (fgets(maps_buff, 512, maps) == NULL)
+        if (fgets(maps_buff, 512, maps) == nullptr)
           break;
         if (i == 0) {
           maps_buff[strlen(maps_buff) - 1] = '\0';
@@ -312,9 +313,10 @@ std::vector<std::string> resolveBacktrace(
 
       /* check whether the trick worked */
       if (strcmp("??", line_func)) {
-        XBT_DEBUG("Found dynamic symbol %s() at %s", line_func, line_pos);
+        auto name = simgrid::xbt::demangle(line_func);
+        XBT_DEBUG("Found dynamic symbol %s at %s", name.get(), line_pos);
         result.push_back(simgrid::xbt::string_printf(
-          "%s() at %s", line_func, line_pos));
+          "%s at %s, %p", name.get(), line_pos, loc[i]));
       } else {
         /* damn, nothing to do here. Let's print the raw address */
         XBT_DEBUG("Dynamic symbol not found. Raw address = %s", backtrace_syms[i]);
@@ -340,11 +342,8 @@ std::vector<std::string> resolveBacktrace(
 
 #if HAVE_MC
 int xbt_libunwind_backtrace(void** bt, int size){
-  int i = 0;
-  for(i=0; i < size; i++)
-    bt[i] = NULL;
-
-  i=0;
+  for (int i = 0; i < size; i++)
+    bt[i] = nullptr;
 
   unw_cursor_t c;
   unw_context_t uc;
@@ -352,14 +351,13 @@ int xbt_libunwind_backtrace(void** bt, int size){
   unw_getcontext (&uc);
   unw_init_local (&c, &uc);
 
-  unw_word_t ip;
-
   unw_step(&c);
 
-  while(unw_step(&c) >= 0 && i < size){
+  int i;
+  for (i = 0; unw_step(&c) >= 0 && i < size; i++) {
+    unw_word_t ip;
     unw_get_reg(&c, UNW_REG_IP, &ip);
     bt[i] = (void*)(long)ip;
-    i++;
   }
 
   return i;