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

diff --git a/src/xbt/backtrace_linux.c b/src/xbt/backtrace_linux.c
index e5ddbb9ab4..e57e486018 100644
--- a/src/xbt/backtrace_linux.c
+++ b/src/xbt/backtrace_linux.c
@@ -56,15 +56,17 @@ 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");
 
+  if (!xbt_binary_name) /* no binary name, nothing to do */
+    return;
+
   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;
 
@@ -89,22 +91,22 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
           binary_name = bprintf("%s/%s", data, xbt_binary_name);
           if (!stat(binary_name, &stat_buf)) {
             /* Found. */
-            DEBUG1("Looked in the PATH for the binary. Found %s",
+            XBT_DEBUG("Looked in the PATH for the binary. Found %s",
                    binary_name);
-            xbt_dynar_free(&path);
             break;
           }
         }
+        xbt_dynar_free(&path);
         if (stat(binary_name, &stat_buf)) {
           /* not found */
           e->used = 1;
           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 the path)", xbt_binary_name);
+          free(backtrace_syms);
           return;
         }
-        xbt_dynar_free(&path);
         break;
       }
     }
@@ -112,23 +114,24 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
     binary_name = xbt_strdup(xbt_binary_name);
   }
   cmd = curr =
-    xbt_new(char,
-            strlen(ADDR2LINE) + 25 + strlen(binary_name) + 32 * e->used);
+      xbt_new(char,
+              strlen(ADDR2LINE) + 25 + strlen(binary_name) + 32 * e->used);
 
   curr += sprintf(curr, "%s -f -e %s ", ADDR2LINE, binary_name);
   free(binary_name);
 
+  addrs = xbt_new(char *, e->used);
   for (i = 0; i < e->used; i++) {
     /* retrieve this address */
-    DEBUG2("Retrieving address number %d from '%s'", i, backtrace_syms[i]);
+    XBT_DEBUG("Retrieving address number %d from '%s'", i, backtrace_syms[i]);
     snprintf(buff, 256, "%s", strchr(backtrace_syms[i], '[') + 1);
     p = strchr(buff, ']');
     *p = '\0';
     if (strcmp(buff, "(nil)"))
-      addrs[i] = bprintf("%s", buff);
+      addrs[i] = xbt_strdup(buff);
     else
-      addrs[i] = bprintf("0x0");
-    DEBUG3("Set up a new address: %d, '%s'(%p)", i, addrs[i], addrs[i]);
+      addrs[i] = xbt_strdup("0x0");
+    XBT_DEBUG("Set up a new address: %d, '%s'(%p)", i, addrs[i], addrs[i]);
 
     /* Add it to the command line args */
     curr += sprintf(curr, "%s ", addrs[i]);
@@ -138,30 +141,33 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
   /* parse the output and build a new backtrace */
   e->bt_strings = xbt_new(char *, e->used);
 
-  VERB1("Fire a first command: '%s'", cmd);
+  XBT_VERB("Fire a first command: '%s'", cmd);
   pipe = popen(cmd, "r");
   if (!pipe) {
-    CRITICAL0("Cannot fork addr2line to display the backtrace");
+    XBT_CRITICAL("Cannot fork addr2line to display the backtrace");
     abort();
   }
 
   for (i = 0; i < e->used; i++) {
     char *fgets_res;
-    DEBUG2("Looking for symbol %d, addr = '%s'", i, addrs[i]);
+    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,
-             "Cannot run fgets to look for symbol %d, addr %s", i, addrs[i]);
+      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,
-             "Cannot run fgets to look for symbol %d, addr %s", i, addrs[i]);
+      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)) {
-      DEBUG2("Found static symbol %s() at %s", line_func, line_pos);
-      e->bt_strings[i] = bprintf("**   In %s() at %s", line_func, line_pos);
+      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);
     } else {
       /* Damn. The symbol is in a dynamic library. Let's get wild */
       char *maps_name;
@@ -179,14 +185,12 @@ 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)) {
-        CRITICAL2("Cannot parse backtrace address '%s' (addr=%#lx)",
+      addr = strtol(addrs[i], &p, 16);
+      if (*p != '\0') {
+        XBT_CRITICAL("Cannot parse backtrace address '%s' (addr=%#lx)",
                   addrs[i], addr);
       }
-      DEBUG2("addr=%s (as string) =%#lx (as number)", addrs[i], addr);
+      XBT_DEBUG("addr=%s (as string) =%#lx (as number)", addrs[i], addr);
 
       while (!found) {
         long int first, last;
@@ -195,7 +199,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
           break;
         if (i == 0) {
           maps_buff[strlen(maps_buff) - 1] = '\0';
-          DEBUG1("map line: %s", maps_buff);
+          XBT_DEBUG("map line: %s", maps_buff);
         }
         sscanf(maps_buff, "%lx", &first);
         p = strchr(maps_buff, '-') + 1;
@@ -205,18 +209,19 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
           found = 1;
         }
         if (found) {
-          DEBUG3("%#lx in [%#lx-%#lx]", addr, first, last);
-          DEBUG0
-            ("Symbol found, map lines not further displayed (even if looking for next ones)");
+          XBT_DEBUG("%#lx in [%#lx-%#lx]", addr, first, last);
+          XBT_DEBUG
+              ("Symbol found, map lines not further displayed (even if looking for next ones)");
         }
       }
       fclose(maps);
       free(maps_name);
+      free(addrs[i]);
 
       if (!found) {
-        VERB0
-          ("Problem while reading the maps file. Following backtrace will be mangled.");
-        DEBUG1("No dynamic. Static symbol: %s", backtrace_syms[i]);
+        XBT_VERB
+            ("Problem while reading the maps file. Following backtrace will be mangled.");
+        XBT_DEBUG("No dynamic. Static symbol: %s", backtrace_syms[i]);
         e->bt_strings[i] = bprintf("**   In ?? (%s)", backtrace_syms[i]);
         continue;
       }
@@ -225,9 +230,8 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
          We now need to substract this from the address we got from backtrace.
        */
 
-      free(addrs[i]);
       addrs[i] = bprintf("0x%0*lx", addr_len - 2, addr - offset);
-      DEBUG2("offset=%#lx new addr=%s", offset, addrs[i]);
+      XBT_DEBUG("offset=%#lx new addr=%s", offset, addrs[i]);
 
       /* Got it. We have our new address. Let's get the library path and we
          are set */
@@ -247,20 +251,20 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
         /* Here we go, fire an addr2line up */
         subcmd = bprintf("%s -f -e %s %s", ADDR2LINE, p, addrs[i]);
         free(p);
-        VERB1("Fire a new command: '%s'", subcmd);
+        XBT_VERB("Fire a new command: '%s'", subcmd);
         subpipe = popen(subcmd, "r");
         if (!subpipe) {
-          CRITICAL0("Cannot fork addr2line to display the backtrace");
+          XBT_CRITICAL("Cannot fork addr2line to display the backtrace");
           abort();
         }
         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);
@@ -269,11 +273,12 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
 
       /* check whether the trick worked */
       if (strcmp("??", line_func)) {
-        DEBUG2("Found dynamic symbol %s() at %s", line_func, line_pos);
-        e->bt_strings[i] = bprintf("**   In %s() at %s", line_func, line_pos);
+        XBT_DEBUG("Found dynamic symbol %s() at %s", line_func, line_pos);
+        e->bt_strings[i] =
+            bprintf("**   In %s() at %s", line_func, line_pos);
       } else {
         /* damn, nothing to do here. Let's print the raw address */
-        DEBUG1("Dynamic symbol not found. Raw address = %s",
+        XBT_DEBUG("Dynamic symbol not found. Raw address = %s",
                backtrace_syms[i]);
         e->bt_strings[i] = bprintf("**   In ?? at %s", backtrace_syms[i]);
       }
@@ -284,18 +289,20 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
     /* Mask the bottom of the stack */
     if (!strncmp("main", line_func, strlen("main")) ||
         !strncmp("xbt_thread_context_wrapper", line_func,
-                 strlen("xbt_thread_context_wrapper"))) {
+                 strlen("xbt_thread_context_wrapper"))
+        || !strncmp("smx_ctx_sysv_wrapper", line_func,
+                    strlen("smx_ctx_sysv_wrapper"))) {
       int j;
 
       for (j = i + 1; j < e->used; j++)
         free(addrs[j]);
-      e->used = i;
+      e->used = i + 1;
 
       if (!strncmp
           ("xbt_thread_context_wrapper", line_func,
            strlen("xbt_thread_context_wrapper"))) {
-        e->used++;
-        e->bt_strings[i] = bprintf("**   (in a separate thread)");
+        free(e->bt_strings[i]);
+        e->bt_strings[i] = xbt_strdup("**   (in a separate thread)");
       }
     }