X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/696ee2a4af4489387e1557a5bd4bcc523d56ff04..12442080c860b7affd1b246f12895bda4f304330:/src/xbt/ex.c

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index f5a7969b52..f758c702c0 100644
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -52,6 +52,7 @@ void xbt_backtrace_display(void) {
 #endif
 }
 
+
 void xbt_ex_setup_backtrace(xbt_ex_t *e)  {
 #if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
   int i;
@@ -59,7 +60,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t *e)  {
   char **backtrace = backtrace_symbols (e->bt, e->used);
   
   /* To build the commandline of addr2line */
-  char *cmd = xbt_new(char,strlen(ADDR2LINE)+strlen(xbt_binary_name)+20*e->used);
+  char *cmd = xbt_new(char,strlen(ADDR2LINE)+25+strlen(xbt_binary_name)+32*e->used);
   char *curr=cmd;
   
   /* to extract the addresses from the backtrace */
@@ -72,16 +73,25 @@ void xbt_ex_setup_backtrace(xbt_ex_t *e)  {
 
   /* size (in char) of pointers on this arch */
   int addr_len=0;
-  
+
+  /* Some arches only have stubs of backtrace, no implementation (hppa comes to mind) */
+  if (!e->used)
+     return;
+   
   /* build the commandline */
   curr += sprintf(curr,"%s -f -e %s ",ADDR2LINE,xbt_binary_name);
   for (i=0; i<e->used;i++) {
     /* retrieve this address */
+    DEBUG2("Retrieving address number %d from '%s'", i, backtrace[i]);
     snprintf(buff,256,"%s",strchr(backtrace[i],'[')+1);
     p=strchr(buff,']');
     *p='\0';
-    addrs[i]=bprintf("%s",buff);
-    
+    if (strcmp(buff,"(nil)"))
+       addrs[i]=bprintf("%s", buff);
+    else
+       addrs[i]=bprintf("0x0");
+    DEBUG3("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]);
   }	 
@@ -90,19 +100,23 @@ 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);
   pipe = popen(cmd, "r");
   if (!pipe) {
     CRITICAL0("Cannot fork addr2line to display the backtrace");
     abort();
   }
+
   for (i=0; i<e->used; i++) {
+    DEBUG2("Looking for symbol %d, addr = '%s'", i, addrs[i]); 
     fgets(line_func,1024,pipe);
     line_func[strlen(line_func)-1]='\0';
     fgets(line_pos,1024,pipe);
     line_pos[strlen(line_pos)-1]='\0';
 
     if (strcmp("??",line_func)) {
-      e->bt_strings[i] = bprintf("**   In %s() at %s (static symbol)", line_func,line_pos);
+      DEBUG2("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;
@@ -151,7 +165,8 @@ void xbt_ex_setup_backtrace(xbt_ex_t *e)  {
       free(maps_name);
 
       if (!found) {
-	WARN0("Problem while reading the maps file");
+	VERB0("Problem while reading the maps file. Following backtrace will be mangled.");
+	DEBUG1("No dynamic. Static symbol: %s", backtrace[i]);
 	e->bt_strings[i] = bprintf("**   In ?? (%s)", backtrace[i]);
 	continue;
       }
@@ -170,7 +185,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t *e)  {
       p2 = strrchr(p,'(');
       if (p2) *p2= '\0';
       p2 = strrchr(p,' ');
-      if (p2) *p2= '\0';
+      if(p2) *p2= '\0';
       
       /* Here we go, fire an addr2line up */
       subcmd = bprintf("%s -f -e %s %s",ADDR2LINE,p, addrs[i]);
@@ -190,13 +205,33 @@ void xbt_ex_setup_backtrace(xbt_ex_t *e)  {
 
       /* check whether the trick worked */
       if (strcmp("??",line_func)) {
-	e->bt_strings[i] = bprintf("**   In %s() at %s (dynamic symbol)", line_func,line_pos);
+	DEBUG2("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", backtrace[i]);
 	e->bt_strings[i] = bprintf("**   In ?? (%s)", backtrace[i]);
       }
+      
     }
     free(addrs[i]);
+     
+    /* Mask the bottom of the stack */    
+    if (!strncmp("main",line_func,strlen("main"))) {
+       int j;
+       for (j=i+1; j<e->used; j++)
+	 free(addrs[j]);
+       e->used = i+1;
+    }
+     
+    if (!strncmp("__context_wrapper",line_func,strlen("__context_wrapper"))) {
+       int j;
+       for (j=i+1; j<e->used; j++)
+	 free(addrs[j]);
+       e->used = i;
+    }
+   
+    
   }
   pclose(pipe);
   free(addrs);
@@ -253,8 +288,9 @@ void __xbt_ex_terminate_default(xbt_ex_t *e)  {
 }
 
 /* the externally visible API */
-ex_ctx_cb_t  __xbt_ex_ctx       = &__xbt_ex_ctx_default;
-ex_term_cb_t __xbt_ex_terminate = &__xbt_ex_terminate_default;
+XBT_PUBLIC_DATA(ex_ctx_cb_t)  __xbt_ex_ctx       = &__xbt_ex_ctx_default;
+XBT_PUBLIC_DATA(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default;
+
 
 void xbt_ex_free(xbt_ex_t e) {
   int i;
@@ -272,7 +308,7 @@ void xbt_ex_free(xbt_ex_t e) {
        free((char*)e.bt_strings[i]);
      free((char **)e.bt_strings);
   }
-//  memset(e,0,sizeof(xbt_ex_t));
+  /* memset(e,0,sizeof(xbt_ex_t)); */
 }
 
 /** \brief returns a short name for the given exception category */
@@ -299,6 +335,7 @@ int backtrace (void **__array, int __size) {
 #endif
 
 #ifdef SIMGRID_TEST
+#include <stdio.h>
 #include "xbt/ex.h"
 
 XBT_TEST_SUITE("xbt_ex","Exception Handling");
@@ -454,9 +491,10 @@ static void bad_example(void) {
   /* end_of_bad_example */
 }
 #endif
-
+typedef struct {char *first;} global_context_t;
+   
 static void good_example(void) {
-  struct {char*first;} *globalcontext;
+  global_context_t *global_context=malloc(sizeof(global_context_t));
   xbt_ex_t ex;
 
   /* GOOD_EXAMPLE */
@@ -466,7 +504,7 @@ static void good_example(void) {
     char * volatile /*03*/ cp3 = NULL /*02*/;
     TRY {
       cp1 = mallocex(SMALLAMOUNT);
-      globalcontext->first = cp1;
+      global_context->first = cp1;
       cp1 = NULL /*05 give away*/;
       cp2 = mallocex(TOOBIG);
       cp3 = mallocex(SMALLAMOUNT);