X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01fc1d9e1180d76f5aa78180d54ef9f4088a2e90..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/src/xbt/ex.c diff --git a/src/xbt/ex.c b/src/xbt/ex.c index 7faa0f0079..680b110661 100644 --- a/src/xbt/ex.c +++ b/src/xbt/ex.c @@ -1,6 +1,8 @@ /* ex - Exception Handling */ -/* Copyright (c) 2005-2010 The SimGrid team */ +/* Copyright (c) 2005-2015. The SimGrid Team. + * All rights reserved. */ + /* Copyright (c) 2002-2004 Ralf S. Engelschall */ /* Copyright (c) 2002-2004 The OSSP Project */ /* Copyright (c) 2002-2004 Cable & Wireless */ @@ -43,12 +45,16 @@ #include #include -#include "portable.h" /* execinfo when available */ +#include "src/portable.h" /* execinfo when available */ #include "xbt/ex.h" #include "xbt/str.h" -#include "xbt_modinter.h" /* backtrace initialization headers */ +#include "xbt/synchro_core.h" +#include "src/xbt_modinter.h" /* backtrace initialization headers */ + +#include "src/xbt/ex_interface.h" +#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */ -#include "xbt/ex_interface.h" +#include "simgrid/simix.h" /* SIMIX_process_self_get_name() */ #undef HAVE_BACKTRACE #if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE) @@ -74,7 +80,7 @@ xbt_running_ctx_t *__xbt_ex_ctx_default(void) real life and in simulation when using threads to implement the simulation processes (ie, with pthreads and on windows). - It also gets overriden in xbt/context.c when using ucontextes (as well as + It also gets overriden in xbt/context.c when using ucontexts (as well as in Java for now, but after the java overhaul, it will get cleaned out) */ static xbt_running_ctx_t ctx = XBT_RUNNING_CTX_INITIALIZER; @@ -95,8 +101,8 @@ void xbt_backtrace_display(xbt_ex_t * e) } else { int i; - fprintf(stderr, "Backtrace (displayed in thread %p):\n", - (void *) xbt_thread_self()); + fprintf(stderr, "Backtrace (displayed in process %s):\n", + SIMIX_process_self_get_name()); for (i = 1; i < e->used; i++) /* no need to display "xbt_backtrace_display" */ fprintf(stderr, "---> %s\n", e->bt_strings[i] + 4); } @@ -119,17 +125,19 @@ void xbt_backtrace_display_current(void) } #if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE) -# include "backtrace_linux.c" +# include "src/xbt/backtrace_linux.c" #elif (defined(_XBT_WIN32) && defined (_M_IX86)) && !defined(__GNUC__) -# include "backtrace_windows.c" +# include "src/xbt/backtrace_windows.c" #else -# include "backtrace_dummy.c" +# include "src/xbt/backtrace_dummy.c" #endif /** @brief shows an exception content and the associated stack if available */ void xbt_ex_display(xbt_ex_t * e) { char *thrower = NULL; + if (e->pid != xbt_getpid()) + thrower = bprintf(" on process %d",e->pid); fprintf(stderr, "** SimGrid: UNCAUGHT EXCEPTION received on %s(%d): category: %s; value: %d\n" @@ -141,6 +149,11 @@ void xbt_ex_display(xbt_ex_t * e) XBT_CRITICAL("%s", e->msg); xbt_free(thrower); + if (xbt_initialized==0 || smx_cleaned) { + fprintf(stderr, "Ouch. SimGrid is not initialized yet, or already closing. No backtrace available.\n"); + return; /* Not started yet or already closing. Trying to generate a backtrace would probably fail */ + } + if (!e->bt_strings) xbt_ex_setup_backtrace(e); @@ -148,10 +161,34 @@ void xbt_ex_display(xbt_ex_t * e) if (e->used && e->bt_strings) { /* We have everything to build neat backtraces */ int i; + int cutpath = 0; + TRY { // We don't want to have an exception while checking how to deal with the one we already have, do we? + cutpath = sg_cfg_get_boolean("exception/cutpath"); + } CATCH_ANONYMOUS { } fprintf(stderr, "\n"); - for (i = 0; i < e->used; i++) - fprintf(stderr, "%s\n", e->bt_strings[i]); + for (i = 0; i < e->used; i++) { + + if (cutpath) { + char* p = e->bt_strings[i]; + xbt_str_rtrim(p, ":0123456789"); + char* filename = strrchr(p, '/')+1; + char* end_of_message = strrchr(p, ' '); + + int length = strlen(p)-strlen(end_of_message); + char* dest = malloc(length); + + memcpy(dest, &p[0], length); + dest[length] = 0; + + fprintf(stderr, "%s %s\n", dest, filename); + + free(dest); + } + else { + fprintf(stderr, "%s\n", e->bt_strings[i]); + } + } } else #endif @@ -174,8 +211,7 @@ void __xbt_ex_terminate_default(xbt_ex_t * e) /* the externally visible API */ XBT_EXPORT_NO_IMPORT(xbt_running_ctx_fetcher_t) __xbt_running_ctx_fetch = &__xbt_ex_ctx_default; -XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate = - &__xbt_ex_terminate_default; +XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default; void xbt_ex_free(xbt_ex_t e) @@ -308,7 +344,7 @@ XBT_TEST_UNIT("variables", test_variables, "variable value preservation") { xbt_ex_t ex; int r1; - int _XBT_GNUC_UNUSED r2; + int XBT_ATTRIB_UNUSED r2; int v1; volatile int v2; @@ -375,37 +411,6 @@ static char *mallocex(int size) #define SMALLAMOUNT 10 #define TOOBIG 100000000 -#if 0 /* this contains syntax errors, actually */ -static void bad_example(void) -{ - struct { - char *first; - } *globalcontext; - ex_t ex; - - /* BAD_EXAMPLE */ - TRY { - char *cp1, *cp2, *cp3; - - cp1 = mallocex(SMALLAMOUNT); - globalcontext->first = cp1; - cp2 = mallocex(TOOBIG); - cp3 = mallocex(SMALLAMOUNT); - strcpy(cp1, "foo"); - strcpy(cp2, "bar"); - } - TRY_CLEANUP { - free(cp3); - free(cp2); - free(cp1); - } - CATCH_ANONYMOUS { - printf("cp3=%s", cp3); - RETHROW; - } - /* end_of_bad_example */ -} -#endif typedef struct { char *first; } global_context_t;