X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/640bdb4e415cc9daee01a37bea85622e385806b8..3c0619f4774180c94441d53b01f34257ad0853fa:/src/xbt/ex.c diff --git a/src/xbt/ex.c b/src/xbt/ex.c index 8be446d5e3..8d1cba1bef 100644 --- a/src/xbt/ex.c +++ b/src/xbt/ex.c @@ -34,6 +34,10 @@ #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 */ /* default __ex_ctx callback function */ ex_ctx_t *__xbt_ex_ctx_default(void) { @@ -42,31 +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; iused;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; iused; 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: category: %s; value: %d\n" + "** 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); - -#ifdef HAVE_EXECINFO_H - { - char **strings; - int i; - - fprintf(stderr,"** Backtrace:\n"); - strings = backtrace_symbols (e->bt, e->used); + e->procname, (e->host?"@":""),(e->host?e->host:"")); - for (i = 0; i < e->used; i++) - printf (" %s\n", strings[i]); + if (!e->remote && !e->bt_strings) + xbt_ex_setup_backtrace(e); - free (strings); - } +#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; iused; 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); } @@ -81,9 +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) { - if (e.msg) free(e.msg); - free(e.procname); +void xbt_ex_free(xbt_ex_t *e) { + int i; + + if (e->msg) free(e->msg); + if (e->remote) { + free(e->procname); + free(e->file); + free(e->func); + free(e->host); + } + + if (e->bt_strings) { + for (i=0; iused; i++) + free((char*)e->bt_strings[i]); + free((char **)e->bt_strings); + } + memset(e,0,sizeof(xbt_ex_t)); } /** \brief returns a short name for the given exception category */ @@ -131,20 +212,33 @@ XBT_TEST_UNIT("controlflow",test_controlflow, "basic nested control flow") { THROW0(unknown_error,0,"something"); } CATCH (ex) { if (n != 3) - xbt_test_fail1("M3: n=%d (!= 1)", n); + xbt_test_fail1("M3: n=%d (!= 3)", n); + n++; + xbt_ex_free(&ex); + } + n++; + TRY { + if (n != 5) + xbt_test_fail1("M2: n=%d (!= 5)", n); + n++; + THROW0(unknown_error,0,"something"); + } CATCH (ex) { + if (n != 6) + xbt_test_fail1("M3: n=%d (!= 6)", n); n++; RETHROW; + n++; } xbt_test_fail1("MX: n=%d (shouldn't reach this point)", n); } CATCH(ex) { - if (n != 4) - xbt_test_fail1("M4: n=%d (!= 4)", n); + if (n != 7) + xbt_test_fail1("M4: n=%d (!= 7)", n); n++; - xbt_ex_free(ex); + xbt_ex_free(&ex); } - if (n != 5) - xbt_test_fail1("M5: n=%d (!= 5)", n); + if (n != 8) + xbt_test_fail1("M5: n=%d (!= 8)", n); } XBT_TEST_UNIT("value",test_value,"exception value passing") { @@ -160,7 +254,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); } } @@ -183,7 +277,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); } } @@ -208,7 +302,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");