do not display backtrace capturing stuff in the displayed backtrace (plus, be eclipse...

[simgrid.git] / src / xbt / backtrace_linux.c

diff --git a/src/xbt/backtrace_linux.c b/src/xbt/backtrace_linux.c
index c4ef0dc..b4fe6be 100644 (file)
--- a/src/xbt/backtrace_linux.c
+++ b/src/xbt/backtrace_linux.c
@@ -9,6 +9,13 @@
 /* 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. */
 
+/* This file is to be included in ex.c, so the following headers are not mandatory, but it's to make sure that eclipse see them too */
+#include "xbt/ex.h"
+#include "xbt/str.h"
+#include "xbt/module.h" /* xbt_binary_name */
+#include "xbt_modinter.h" /* backtrace initialization headers */
+/* end of "useless" inclusions */
+
 extern char **environ;          /* the environment, as specified by the opengroup */
 
 /* Module creation/destruction: nothing to do on linux */
@@ -48,6 +55,9 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
   xbt_assert0(e && e->used,"Backtrace not setup yet, cannot set it up for display");
 
   backtrace_syms = backtrace_symbols(e->bt, e->used);
+  /* ignore first one, which is this xbt_backtrace_current() */
+  e->used--;
+  memmove(backtrace_syms,backtrace_syms+1,sizeof(char*)*e->used);
   addrs = xbt_new(char *, e->used);
 
   e->bt_strings = NULL;
@@ -130,10 +140,15 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
   }
 
   for (i = 0; i < e->used; i++) {
+    char *fgets_res;
     DEBUG2("Looking for symbol %d, addr = '%s'", i, addrs[i]);
-    fgets(line_func, 1024, pipe);
+    fgets_res = fgets(line_func, 1024, pipe);
+    if (fgets_res == NULL)
+      THROW2(system_error,0, "Cannot run fgets to look for symbol %d, addr %s",i, addrs[i]);
     line_func[strlen(line_func) - 1] = '\0';
-    fgets(line_pos, 1024, pipe);
+    fgets_res = fgets(line_pos, 1024, pipe);
+    if (fgets_res == NULL)
+      THROW2(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)) {
@@ -230,9 +245,13 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
           CRITICAL0("Cannot fork addr2line to display the backtrace");
           abort();
         }
-        fgets(line_func, 1024, subpipe);
+        fgets_res=fgets(line_func, 1024, subpipe);
+        if (fgets_res == NULL)
+          THROW1(system_error,0, "Cannot read result of subcommand %s",subcmd);
         line_func[strlen(line_func) - 1] = '\0';
-        fgets(line_pos, 1024, subpipe);
+        fgets_res = fgets(line_pos, 1024, subpipe);
+        if (fgets_res == NULL)
+          THROW1(system_error,0, "Cannot read result of subcommand %s",subcmd);
         line_pos[strlen(line_pos) - 1] = '\0';
         pclose(subpipe);
         free(subcmd);