X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/898d2e42909933180b325b080ac8f7ca016f3bcd..c3eaaf1a8869a1d2fb0364b7dc68e8b6d42ffec1:/src/xbt/ex.c

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index 4c4c6bee5c..7c4b18fa1a 100644
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -34,6 +34,8 @@
 
 #include "portable.h" /* execinfo when available */
 #include "xbt/ex.h"
+#include "xbt/module.h" /* xbt_binary_name */
+#include "xbt/ex_interface.h"
 
 #include "gras/Virtu/virtu_interface.h" /* gras_os_myname */
 
@@ -44,30 +46,94 @@ ex_ctx_t *__xbt_ex_ctx_default(void) {
     return &ctx;
 }
 
+void xbt_ex_setup_backtrace(xbt_ex_t *e)  {
+#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
+  int i;
+  /* to get the backtrace from the libc */
+  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 *curr=cmd;
+  
+  /* to extract the addresses from the backtrace */
+  char **addrs=xbt_new(char*,e->used);
+  char buff[256],*p;
+  
+  /* To read the output of addr2line */
+  FILE *pipe;
+  char line_func[1024],line_pos[1024];
+  
+  /* build the commandline */
+  curr += sprintf(curr,"%s -f -e %s ",ADDR2LINE,xbt_binary_name);
+  for (i=0; i<e->used;i++) {
+    /* retrieve this address */
+    snprintf(buff,256,"%s",strchr(backtrace[i],'[')+1);
+    p=strchr(buff,']');
+    *p='\0';
+    addrs[i]=bprintf("%s",buff);
+    
+    /* Add it to the command line args */
+    curr+=sprintf(curr,"%s ",addrs[i]);
+  }	 
+  
+  /* parse the output and build a new backtrace */
+  e->bt_strings = xbt_new(char*,e->used);
+  
+  pipe = popen(cmd, "r");
+  //     xbt_assert(pipe);//,"Cannot fork addr2line to display the backtrace");
+  for (i=0; i<e->used; 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("**   At %s: %s (%s)", addrs[i], line_func,line_pos);
+    } else {
+      char *p=bprintf("%s",backtrace[i]);
+      char *pos=strrchr(p,' ');
+      *pos = '\0';
+      e->bt_strings[i] = bprintf("**   At %s: ?? (%s)", addrs[i], p);
+      free(p);
+    }
+    free(addrs[i]);
+  }
+  free(addrs);
+  free(backtrace);
+  free(cmd);
+#endif
+}    
+
 /** @brief shows an exception content and the associated stack if available */
 void xbt_ex_display(xbt_ex_t *e)  {
 
   fprintf(stderr,
 	  "** SimGrid: UNCAUGHT EXCEPTION on %s: category: %s; value: %d\n"
 	  "** %s\n"
-	  "** Thrown by %s%s%s at %s:%d:%s\n",
+	  "** Thrown by %s%s%s",
 	  gras_os_myname(),
 	  xbt_ex_catname(e->category), e->value, e->msg,
-	  e->procname, (e->host?"@":""),(e->host?e->host:""),//localhost"),
-	  e->file,e->line,e->func);
+	  e->procname, (e->host?"@":""),(e->host?e->host:""));
 
-#ifdef HAVE_EXECINFO_H
- {
-  int i;
+  if (!e->remote && !e->bt_strings)
+    xbt_ex_setup_backtrace(e);
 
-  fprintf(stderr,"** Backtrace:\n");
-  if (!e->bt_strings)
-    e->bt_strings = backtrace_symbols (e->bt, e->used);
-
-  for (i = 0; i < e->used; i++)
-     printf ("   %s\n", e->bt_strings[i]);
- }
+#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
+  /* We have everything to build neat backtraces */
+  {
+    int i;
+    
+    fprintf(stderr,"\n");
+    for (i=0; i<e->used; i++)
+      fprintf(stderr,"%s\n",e->bt_strings[i]);
+    
+  }
+#else
+  fprintf(stderr," at %s:%d:%s (no backtrace available on that arch)\n",  
+	  e->file,e->line,e->func);
 #endif
+  xbt_ex_free(e);
 }
 
 
@@ -82,25 +148,23 @@ void __xbt_ex_terminate_default(xbt_ex_t *e)  {
 ex_ctx_cb_t  __xbt_ex_ctx       = &__xbt_ex_ctx_default;
 ex_term_cb_t __xbt_ex_terminate = &__xbt_ex_terminate_default;
 
-void xbt_ex_free(xbt_ex_t e) {
+void xbt_ex_free(xbt_ex_t *e) {
   int i;
 
-  if (e.msg) free(e.msg);
-  free(e.procname);
-  if (e.remote) {
-    free(e.file);
-    free(e.func);
-    if (e.bt_strings) /* FIXME: should never be NULL... */
-      for (i=0; i<e.used; i++) 
-	free(e.bt_strings[i]);
-    free(e.bt_strings);
-    e.bt_strings=NULL;
-    free(e.host);
+  if (e->msg) free(e->msg);
+  free(e->procname);
+  if (e->remote) {
+    free(e->file);
+    free(e->func);
+    free(e->host);
   }
-  /* locally, only one chunk of memory is allocated by the libc */
-  if (e.bt_strings)
-    free(e.bt_strings);
-
+  if (e->bt_strings) {	
+     for (i=0; i<e->used; i++) 
+       free(e->bt_strings[i]);
+     free(e->bt_strings);
+     e->bt_strings = NULL;
+  }
+  
 }
 
 /** \brief returns a short name for the given exception category */
@@ -158,7 +222,7 @@ XBT_TEST_UNIT("controlflow",test_controlflow, "basic nested control flow") {
         if (n != 4)
             xbt_test_fail1("M4: n=%d (!= 4)", n);
         n++;
-        xbt_ex_free(ex);
+        xbt_ex_free(&ex);
     }
     if (n != 5)
         xbt_test_fail1("M5: n=%d (!= 5)", n);
@@ -177,7 +241,7 @@ XBT_TEST_UNIT("value",test_value,"exception value passing") {
             xbt_test_fail1("value=%d (!= 2)", ex.value);
         if (strcmp(ex.msg,"toto"))
             xbt_test_fail1("message=%s (!= toto)", ex.msg);
-        xbt_ex_free(ex);
+        xbt_ex_free(&ex);
     }
 }
 
@@ -200,7 +264,7 @@ XBT_TEST_UNIT("variables",test_variables,"variable value preservation") {
         /* r2 is allowed to be destroyed because not volatile */
         if (v2 != 5678)
             xbt_test_fail1("v2=%d (!= 5678)", v2);
-        xbt_ex_free(ex);
+        xbt_ex_free(&ex);
     }
 }
 
@@ -225,7 +289,7 @@ XBT_TEST_UNIT("cleanup",test_cleanup,"cleanup handling") {
             xbt_test_fail1("v1 = %d (!= 5678)", v1);
         if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.msg,"blah")))
             xbt_test_fail0("unexpected exception contents");
-        xbt_ex_free(ex);
+        xbt_ex_free(&ex);
     }
     if (!c)
         xbt_test_fail0("xbt_ex_free not executed");