X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a158b7a4db45818e8f62b7bdac7f0d1bf36d140..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/src/xbt/ex.c diff --git a/src/xbt/ex.c b/src/xbt/ex.c index ade191bd8b..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,15 +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/module.h" /* xbt_binary_name */ -#include "xbt_modinter.h" /* backtrace initialization headers */ -#include "xbt/synchro.h" /* xbt_thread_self */ +#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 "gras/Virtu/virtu_interface.h" /* gras_os_myname */ -#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) @@ -65,6 +68,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mecanism"); +XBT_EXPORT_NO_IMPORT(const xbt_running_ctx_t) __xbt_ex_ctx_initializer = XBT_RUNNING_CTX_INITIALIZER; + /* default __ex_ctx callback function */ xbt_running_ctx_t *__xbt_ex_ctx_default(void) { @@ -75,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; @@ -96,15 +101,14 @@ void xbt_backtrace_display(xbt_ex_t * e) } else { int i; - fprintf(stderr, "Backtrace (displayed in thread %p):\n", - (void *) xbt_thread_self()); - for (i = 1; i < e->used; i++) /* no need to display "xbt_display_backtrace" */ + 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); } /* don't fool xbt_ex_free with uninitialized msg field */ e->msg = NULL; - e->remote = 0; xbt_ex_free(*e); #else @@ -121,51 +125,80 @@ 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->remote) - thrower = bprintf(" on host %s(%d)", e->host, e->pid); + 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" "** %s\n" "** Thrown by %s()%s\n", - gras_os_myname(), (*xbt_getpid) (), + xbt_binary_name, xbt_getpid(), xbt_ex_catname(e->category), e->value, e->msg, e->procname, thrower ? thrower : " in this process"); XBT_CRITICAL("%s", e->msg); + xbt_free(thrower); - if (!e->remote && !e->bt_strings) + 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); #ifdef HAVE_BACKTRACE - /* We have everything to build neat backtraces */ - { + 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 { } - if (!xbt_binary_name) { - fprintf(stderr, "variable 'xbt_binary_name' set to NULL. Cannot compute the backtrace\n"); - return; - } 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 - fprintf(stderr, " at %s:%d:%s (no backtrace available on that arch)\n", - e->file, e->line, e->func); + } else #endif + { + fprintf(stderr, + "\n" + "** In %s() at %s:%d\n" + "** (no backtrace available)\n", + e->func, e->file, e->line); + } } @@ -173,33 +206,24 @@ void xbt_ex_display(xbt_ex_t * e) void __xbt_ex_terminate_default(xbt_ex_t * e) { xbt_ex_display(e); - - abort(); + xbt_abort(); } /* 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) { int i; - if (e.msg) - free(e.msg); - if (e.remote) { - free(e.procname); - free(e.file); - free(e.func); - free(e.host); - } + free(e.msg); if (e.bt_strings) { for (i = 0; i < e.used; i++) - free((char *) e.bt_strings[i]); - free((char **) e.bt_strings); + free(e.bt_strings[i]); + free(e.bt_strings); } /* memset(e,0,sizeof(xbt_ex_t)); */ } @@ -209,24 +233,36 @@ const char *xbt_ex_catname(xbt_errcat_t cat) { switch (cat) { case unknown_error: - return "unknown_err"; + return "unknown error"; case arg_error: - return "invalid_arg"; + return "invalid argument"; + case bound_error: + return "out of bounds"; case mismatch_error: return "mismatch"; case not_found_error: return "not found"; case system_error: - return "system_err"; + return "system error"; case network_error: - return "network_err"; + return "network error"; case timeout_error: return "timeout"; + case cancel_error: + return "action canceled"; case thread_error: - return "thread_err"; - default: - return "INVALID_ERR"; + return "thread error"; + case host_error: + return "host failed"; + case tracing_error: + return "tracing error"; + case io_error: + return "io error"; + case vm_error: + return "vm error"; + } + return "INVALID ERROR"; } @@ -251,7 +287,7 @@ XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow") if (n != 2) xbt_test_fail("M2: n=%d (!= 2)", n); n++; - THROW0(unknown_error, 0, "something"); + THROWF(unknown_error, 0, "something"); } CATCH(ex) { if (n != 3) @@ -264,9 +300,9 @@ XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow") if (n != 5) xbt_test_fail("M2: n=%d (!= 5)", n); n++; - THROW0(unknown_error, 0, "something"); + THROWF(unknown_error, 0, "something"); } - CATCH(ex) { + CATCH_ANONYMOUS { if (n != 6) xbt_test_fail("M3: n=%d (!= 6)", n); n++; @@ -290,12 +326,12 @@ XBT_TEST_UNIT("value", test_value, "exception value passing") xbt_ex_t ex; TRY { - THROW0(unknown_error, 2, "toto"); + THROWF(unknown_error, 2, "toto"); } CATCH(ex) { xbt_test_add("exception value passing"); if (ex.category != unknown_error) - xbt_test_fail("category=%d (!= 1)", ex.category); + xbt_test_fail("category=%d (!= 1)", (int)ex.category); if (ex.value != 2) xbt_test_fail("value=%d (!= 2)", ex.value); if (strcmp(ex.msg, "toto")) @@ -307,15 +343,18 @@ XBT_TEST_UNIT("value", test_value, "exception value passing") XBT_TEST_UNIT("variables", test_variables, "variable value preservation") { xbt_ex_t ex; - int r1, r2; - volatile int v1, v2; + int r1; + int XBT_ATTRIB_UNUSED r2; + int v1; + volatile int v2; r1 = r2 = v1 = v2 = 1234; TRY { r2 = 5678; v2 = 5678; - THROW0(unknown_error, 0, "toto"); - } CATCH(ex) { + THROWF(unknown_error, 0, "toto"); + } + CATCH(ex) { xbt_test_add("variable preservation"); if (r1 != 1234) xbt_test_fail("r1=%d (!= 1234)", r1); @@ -340,8 +379,9 @@ XBT_TEST_UNIT("cleanup", test_cleanup, "cleanup handling") c = 0; TRY { v1 = 5678; - THROW0(1, 2, "blah"); - } TRY_CLEANUP { + THROWF(1, 2, "blah"); + } + TRY_CLEANUP { if (v1 != 5678) xbt_test_fail("v1 = %d (!= 5678)", v1); c = 1; @@ -371,47 +411,13 @@ 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 { - if (cp3 != NULL) - free(cp3); - if (cp2 != NULL) - free(cp2); - if (cp1 != NULL) - free(cp1); - } - CATCH(ex) { - printf("cp3=%s", cp3); - RETHROW; - } - /* end_of_bad_example */ -} -#endif typedef struct { char *first; } global_context_t; static void good_example(void) { - global_context_t *global_context = malloc(sizeof(global_context_t)); - xbt_ex_t ex; + global_context_t *global_context = xbt_malloc(sizeof(global_context_t)); /* GOOD_EXAMPLE */ { /*01 */ @@ -426,15 +432,14 @@ static void good_example(void) cp3 = mallocex(SMALLAMOUNT); strcpy(cp1, "foo"); strcpy(cp2, "bar"); - } TRY_CLEANUP { /*04 */ + } + TRY_CLEANUP { /*04 */ printf("cp3=%s", cp3 == NULL /*02 */ ? "" : cp3); - if (cp3 != NULL) - free(cp3); - if (cp2 != NULL) - free(cp2); + free(cp3); + free(cp2); /*05 cp1 was given away */ } - CATCH(ex) { + CATCH_ANONYMOUS { /*05 global context untouched */ RETHROW; }