X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7141af752d0f9389c4da1c42a151c16369c70f2a..0ed506b0a9c949af9b2f672ac917ecaedca266c0:/src/xbt/backtrace_linux.c

diff --git a/src/xbt/backtrace_linux.c b/src/xbt/backtrace_linux.c
index 1c6b5bca01..966070ad62 100644
--- a/src/xbt/backtrace_linux.c
+++ b/src/xbt/backtrace_linux.c
@@ -28,6 +28,12 @@ void xbt_backtrace_postexit(void)
 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, "Bailing out now since there is nothing I can do without a decent amount of memory. Please go fix the memleaks\n");
+    exit(1);
+  }
 }
 
 
@@ -56,7 +62,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
   struct stat stat_buf;
   char *binary_name = NULL;
 
-  xbt_assert0(e
+  xbt_assert(e
               && e->used,
               "Backtrace not setup yet, cannot set it up for display");
 
@@ -86,8 +92,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
         char *data;
 
         xbt_dynar_foreach(path, cpt, data) {
-          if (binary_name)
-            free(binary_name);
+          free(binary_name);
           binary_name = bprintf("%s/%s", data, xbt_binary_name);
           if (!stat(binary_name, &stat_buf)) {
             /* Found. */
@@ -153,13 +158,13 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
     XBT_DEBUG("Looking for symbol %d, addr = '%s'", i, addrs[i]);
     fgets_res = fgets(line_func, 1024, pipe);
     if (fgets_res == NULL)
-      THROW2(system_error, 0,
+      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)
-      THROW2(system_error, 0,
+      THROWF(system_error, 0,
              "Cannot run fgets to look for symbol %d, addr %s", i,
              addrs[i]);
     line_pos[strlen(line_pos) - 1] = '\0';
@@ -185,10 +190,8 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
       maps_name = bprintf("/proc/%d/maps", (int) getpid());
       maps = fopen(maps_name, "r");
 
-      sscanf(addrs[i], "%lx", &addr);
-      sprintf(maps_buff, "%#lx", addr);
-
-      if (strcmp(addrs[i], maps_buff)) {
+      addr = strtol(addrs[i], &p, 16);
+      if (*p != '\0') {
         XBT_CRITICAL("Cannot parse backtrace address '%s' (addr=%#lx)",
                   addrs[i], addr);
       }
@@ -261,12 +264,12 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
         }
         fgets_res = fgets(line_func, 1024, subpipe);
         if (fgets_res == NULL)
-          THROW1(system_error, 0, "Cannot read result of subcommand %s",
+          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)
-          THROW1(system_error, 0, "Cannot read result of subcommand %s",
+          THROWF(system_error, 0, "Cannot read result of subcommand %s",
                  subcmd);
         line_pos[strlen(line_pos) - 1] = '\0';
         pclose(subpipe);