X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bee3400ba6e1daeca869db8753dc4d86bcda28ca..287f3ab4d9a5a58f3e449311aa501ca504fded54:/src/xbt/ex.c diff --git a/src/xbt/ex.c b/src/xbt/ex.c index 9768d5e640..a543fb8fce 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-2014. 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 */ @@ -46,11 +48,9 @@ #include "portable.h" /* execinfo when available */ #include "xbt/ex.h" #include "xbt/str.h" -#include "xbt/module.h" /* xbt_binary_name */ +#include "xbt/synchro_core.h" #include "xbt_modinter.h" /* backtrace initialization headers */ -#include "xbt/synchro.h" /* xbt_thread_self */ -#include "gras/Virtu/virtu_interface.h" /* gras_os_myname */ #include "xbt/ex_interface.h" #undef HAVE_BACKTRACE @@ -65,6 +65,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 +77,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; @@ -104,7 +106,6 @@ void xbt_backtrace_display(xbt_ex_t * e) /* don't fool xbt_ex_free with uninitialized msg field */ e->msg = NULL; - e->remote = 0; xbt_ex_free(*e); #else @@ -132,40 +133,40 @@ void xbt_backtrace_display_current(void) 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 (!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; - 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]); - } -#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,14 +174,12 @@ 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) @@ -188,12 +187,6 @@ void xbt_ex_free(xbt_ex_t e) int i; 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; i < e.used; i++) @@ -208,24 +201,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"; } @@ -294,7 +299,7 @@ XBT_TEST_UNIT("value", test_value, "exception value passing") 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")) @@ -306,8 +311,10 @@ 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_GNUC_UNUSED r2; + int v1; + volatile int v2; r1 = r2 = v1 = v2 = 1234; TRY { @@ -409,7 +416,7 @@ typedef struct { static void good_example(void) { - global_context_t *global_context = malloc(sizeof(global_context_t)); + global_context_t *global_context = xbt_malloc(sizeof(global_context_t)); /* GOOD_EXAMPLE */ { /*01 */