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

diff --git a/src/xbt/backtrace_linux.c b/src/xbt/backtrace_linux.c
index b4fe6be390..da489dc102 100644
--- a/src/xbt/backtrace_linux.c
+++ b/src/xbt/backtrace_linux.c
@@ -1,10 +1,8 @@
-/* $Id: ex.c 5173 2008-01-07 22:10:52Z mquinson $ */
-
 /* backtrace_linux - backtrace displaying on linux platform                 */
 /* This file is included by ex.c on need (have execinfo.h, popen & addrline)*/
 
-/*  Copyright (c) 2007 The SimGrid team                                     */
-/*  All rights reserved.                                                    */
+/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* 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. */
@@ -12,17 +10,23 @@
 /* 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 */
+#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 */
-void xbt_backtrace_init(void) { }
-void xbt_backtrace_exit(void) { }
+void xbt_backtrace_preinit(void)
+{
+}
 
-void xbt_backtrace_current(xbt_ex_t * e) {
+void xbt_backtrace_postexit(void)
+{
+}
+
+void xbt_backtrace_current(xbt_ex_t * e)
+{
   e->used = backtrace((void **) e->bt, XBT_BACKTRACE_SIZE);
 }
 
@@ -52,12 +56,14 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
   struct stat stat_buf;
   char *binary_name = NULL;
 
-  xbt_assert0(e && e->used,"Backtrace not setup yet, cannot set it up for display");
+  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);
+  memmove(backtrace_syms, backtrace_syms + 1, sizeof(char *) * e->used);
   addrs = xbt_new(char *, e->used);
 
   e->bt_strings = NULL;
@@ -144,11 +150,13 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
     DEBUG2("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]);
+      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_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]);
+      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)) {
@@ -199,7 +207,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
         if (found) {
           DEBUG3("%#lx in [%#lx-%#lx]", addr, first, last);
           DEBUG0
-          ("Symbol found, map lines not further displayed (even if looking for next ones)");
+            ("Symbol found, map lines not further displayed (even if looking for next ones)");
         }
       }
       fclose(maps);
@@ -207,7 +215,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
 
       if (!found) {
         VERB0
-        ("Problem while reading the maps file. Following backtrace will be mangled.");
+          ("Problem while reading the maps file. Following backtrace will be mangled.");
         DEBUG1("No dynamic. Static symbol: %s", backtrace_syms[i]);
         e->bt_strings[i] = bprintf("**   In ?? (%s)", backtrace_syms[i]);
         continue;
@@ -245,13 +253,15 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
           CRITICAL0("Cannot fork addr2line to display the backtrace");
           abort();
         }
-        fgets_res=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);
+          THROW1(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",subcmd);
+          THROW1(system_error, 0, "Cannot read result of subcommand %s",
+                 subcmd);
         line_pos[strlen(line_pos) - 1] = '\0';
         pclose(subpipe);
         free(subcmd);
@@ -273,8 +283,8 @@ 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"))) {
+        !strncmp("xbt_thread_context_wrapper", line_func, 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++)