X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb3be59d63b0d199fa3f32b5a22553e44cfb917a..c5071b3b404fbbfc84172a08fb4086bc5ce97fc9:/src/xbt/backtrace_linux.c

diff --git a/src/xbt/backtrace_linux.c b/src/xbt/backtrace_linux.c
index 9704bc0560..81c62510b2 100644
--- a/src/xbt/backtrace_linux.c
+++ b/src/xbt/backtrace_linux.c
@@ -12,6 +12,7 @@
 #include "xbt/str.h"
 #include "xbt/module.h"         /* xbt_binary_name */
 #include "xbt_modinter.h"       /* backtrace initialization headers */
+#include <libunwind.h>
 /* end of "useless" inclusions */
 
 extern char **environ;          /* the environment, as specified by the opengroup */
@@ -58,6 +59,11 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
  * */
 
 int xbt_backtrace_no_malloc(void **array, int size) {
+
+  int i = 0;
+  for(i=0; i < size; i++)
+    array[i] = NULL;
+
   struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
 
   if (size >= 1)
@@ -75,7 +81,8 @@ void xbt_backtrace_current(xbt_ex_t * e)
   e->used = backtrace((void **) e->bt, XBT_BACKTRACE_SIZE);
   if (e->used == 0) {
     fprintf(stderr, "The backtrace() function failed, which probably means that the memory is exhausted. Here is a crude dump of the exception that I was trying to build:");
-    fprintf(stderr, "%s:%s(%d) [%s:%d] %s", e->host,e->procname,e->pid, e->file,e->line,e->msg);
+    fprintf(stderr, "%s(%d) [%s:%d] %s",
+            e->procname, e->pid, e->file, e->line, e->msg);
     fprintf(stderr, "Bailing out now since there is nothing I can do without a decent amount of memory. Please go fix the memleaks\n");
     exit(1);
   }
@@ -111,7 +118,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e) //FIXME: This code could be greatly im
 
   e->bt_strings = NULL;
 
-  if (!xbt_binary_name) /* no binary name, nothing to do */
+  if (xbt_binary_name == NULL) /* no binary name, nothing to do */
     return;
 
   if (e->used <= 1)
@@ -149,7 +156,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e) //FIXME: This code could be greatly im
           e->bt_strings = xbt_new(char *, 1);
 
           e->bt_strings[0] =
-              bprintf("(binary '%s' not found the path)", xbt_binary_name);
+              bprintf("(binary '%s' not found in the PATH)", xbt_binary_name);
           free(backtrace_syms);
           return;
         }
@@ -191,27 +198,25 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e) //FIXME: This code could be greatly im
   XBT_VERB("Fire a first command: '%s'", cmd);
   pipe = popen(cmd, "r");
   if (!pipe) {
-    XBT_CRITICAL("Cannot fork addr2line to display the backtrace");
-    abort();
+    xbt_die("Cannot fork addr2line to display the backtrace");
   }
 
   for (i = 0; i < e->used; i++) {
-    char *fgets_res;
     XBT_DEBUG("Looking for symbol %d, addr = '%s'", i, addrs[i]);
-    fgets_res = fgets(line_func, 1024, pipe);
-    if (fgets_res == NULL)
-      THROWF(system_error, 0,
-             "Cannot run fgets to look for symbol %d, addr %s", i,
-             addrs[i]);
-    line_func[strlen(line_func) - 1] = '\0';
-    fgets_res = fgets(line_pos, 1024, pipe);
-    if (fgets_res == NULL)
-      THROWF(system_error, 0,
-             "Cannot run fgets to look for symbol %d, addr %s", i,
-             addrs[i]);
-    line_pos[strlen(line_pos) - 1] = '\0';
-
-    if (strcmp("??", line_func)) {
+    if (fgets(line_func, 1024, pipe)) {
+      line_func[strlen(line_func) - 1] = '\0';
+    } else {
+      XBT_VERB("Cannot run fgets to look for symbol %d, addr %s", i, addrs[i]);
+      strcpy(line_func, "???");
+    }
+    if (fgets(line_pos, 1024, pipe)) {
+      line_pos[strlen(line_pos) - 1] = '\0';
+    } else {
+      XBT_VERB("Cannot run fgets to look for symbol %d, addr %s", i, addrs[i]);
+      strcpy(line_pos, backtrace_syms[i]);
+    }
+
+    if (strcmp("??", line_func) != 0) {
       XBT_DEBUG("Found static symbol %s() at %s", line_func, line_pos);
       e->bt_strings[i] =
           bprintf("**   In %s() at %s", line_func, line_pos);
@@ -301,19 +306,20 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e) //FIXME: This code could be greatly im
         XBT_VERB("Fire a new command: '%s'", subcmd);
         subpipe = popen(subcmd, "r");
         if (!subpipe) {
-          XBT_CRITICAL("Cannot fork addr2line to display the backtrace");
-          abort();
+          xbt_die("Cannot fork addr2line to display the backtrace");
+        }
+        if (fgets(line_func, 1024, subpipe)) {
+          line_func[strlen(line_func) - 1] = '\0';
+        } else {
+          XBT_VERB("Cannot read result of subcommand %s", subcmd);
+          strcpy(line_func, "???");
+        }
+        if (fgets(line_pos, 1024, subpipe)) {
+          line_pos[strlen(line_pos) - 1] = '\0';
+        } else {
+          XBT_VERB("Cannot read result of subcommand %s", subcmd);
+          strcpy(line_pos, backtrace_syms[i]);
         }
-        fgets_res = fgets(line_func, 1024, subpipe);
-        if (fgets_res == NULL)
-          THROWF(system_error, 0, "Cannot read result of subcommand %s",
-                 subcmd);
-        line_func[strlen(line_func) - 1] = '\0';
-        fgets_res = fgets(line_pos, 1024, subpipe);
-        if (fgets_res == NULL)
-          THROWF(system_error, 0, "Cannot read result of subcommand %s",
-                 subcmd);
-        line_pos[strlen(line_pos) - 1] = '\0';
         pclose(subpipe);
         free(subcmd);
       }
@@ -360,3 +366,33 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e) //FIXME: This code could be greatly im
   free(backtrace_syms);
   free(cmd);
 }
+
+int xbt_libunwind_backtrace(void* bt[XBT_BACKTRACE_SIZE], int size){
+  
+  int i = 0;
+  for(i=0; i < size; i++)
+    bt[i] = NULL;
+
+  i=0;
+
+  unw_cursor_t c;
+  unw_context_t uc;
+
+  unw_getcontext (&uc);
+	unw_init_local (&c, &uc);
+ 
+  unw_word_t ip;
+
+  unw_step(&c);
+ 
+  while(unw_step(&c) >= 0 && i < size){
+
+    unw_get_reg(&c, UNW_REG_IP, &ip);
+    bt[i] = (void*)(long)ip;
+    i++;
+
+  }
+
+  return i;
+  
+}