X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad5365a072943b2b0bacc486fa504e93a99ea940..3a3e6844ae7c79aca66a93c63cd583086d9df432:/include/xbt/ex.h diff --git a/include/xbt/ex.h b/include/xbt/ex.h index 86830754f0..5763ec90ec 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -14,33 +14,27 @@ #ifndef __XBT_EX_H__ #define __XBT_EX_H__ -#include -#include - -/* do not include execinfo.h directly since it's not always available. - Instead, copy the parts we need (and fake when it's not there) */ -extern int backtrace (void **__array, int __size); - -/* required ISO-C standard facilities */ -#include -#include - +#include "xbt/sysdep.h" +#include "xbt/misc.h" +#include "xbt/virtu.h" /*-*-* Emergency debuging: define this when the exceptions get crazy *-*-*/ #undef __EX_MAYDAY #ifdef __EX_MAYDAY -XBT_PUBLIC(int) gras_os_getpid(void); +# include +#include + # define MAYDAY_SAVE(m) printf("%d %s:%d save %p\n", \ - gras_os_getpid(),__FILE__,__LINE__, \ + (*xbt_getpid)(),__FILE__,__LINE__, \ (m)->jb \ ), # define MAYDAY_RESTORE(m) printf("%d %s:%d restore %p\n", \ - gras_os_getpid(),__FILE__,__LINE__, \ + (*xbt_getpid)(),__FILE__,__LINE__, \ (m)->jb \ ), # define MAYDAY_CATCH(e) printf("%d %s:%d Catched '%s'\n", \ - gras_os_getpid(),__FILE__,__LINE__, \ + (*xbt_getpid)(),__FILE__,__LINE__, \ e.msg \ ), #else @@ -229,23 +223,22 @@ typedef struct { __ex_mctx_struct } __ex_mctx_t; * @{ */ -/* we need this symbol here, even if it breaks a bit the module separation */ -XBT_PUBLIC long int gras_os_getpid(void); - /** @brief different kind of errors */ typedef enum { unknown_error=0, /**< unknown error */ arg_error, /**< Invalid argument */ + bound_error, /**< Out of bounds argument */ mismatch_error, /**< The provided ID does not match */ not_found_error, /**< The searched element was not found */ system_error, /**< a syscall did fail */ network_error, /**< error while sending/receiving data */ timeout_error, /**< not quick enough, dude */ - thread_error /**< error while [un]locking */ + thread_error, /**< error while [un]locking */ + host_error /**< host failed */ } xbt_errcat_t; -XBT_PUBLIC const char * xbt_ex_catname(xbt_errcat_t cat); +XBT_PUBLIC(const char *) xbt_ex_catname(xbt_errcat_t cat); /** @brief Structure describing an exception */ typedef struct { @@ -257,7 +250,7 @@ typedef struct { char *host; /**< NULL locally thrown exceptions; full hostname if remote ones */ /* FIXME: host should be hostname:port[#thread] */ char *procname; /**< Name of the process who thrown this */ - long int pid; /**< PID of the process who thrown this */ + int pid; /**< PID of the process who thrown this */ char *file; /**< Thrown point */ int line; /**< Thrown point */ char *func; /**< Thrown point */ @@ -309,12 +302,12 @@ typedef struct { /* the exception context */ typedef ex_ctx_t *(*ex_ctx_cb_t)(void); -extern ex_ctx_cb_t __xbt_ex_ctx; +XBT_PUBLIC_DATA(ex_ctx_cb_t) __xbt_ex_ctx; extern ex_ctx_t *__xbt_ex_ctx_default(void); /* the termination handler */ typedef void (*ex_term_cb_t)(xbt_ex_t *); -extern ex_term_cb_t __xbt_ex_terminate; +XBT_PUBLIC_DATA(ex_term_cb_t) __xbt_ex_terminate; extern void __xbt_ex_terminate_default(xbt_ex_t *e); /** @brief Introduce a block where exception may be dealed with @@ -403,22 +396,24 @@ extern void __xbt_ex_terminate_default(xbt_ex_t *e); */ #define _THROW(c,v,m) \ - do { /* change this sequence into one block */ \ - /* build the exception */ \ - __xbt_ex_ctx()->ctx_ex.msg = (m); \ - __xbt_ex_ctx()->ctx_ex.category = (xbt_errcat_t)(c); \ - __xbt_ex_ctx()->ctx_ex.value = (v); \ - __xbt_ex_ctx()->ctx_ex.remote = 0; \ - __xbt_ex_ctx()->ctx_ex.host = (char*)NULL; \ - __xbt_ex_ctx()->ctx_ex.procname = (char*)xbt_procname(); \ - __xbt_ex_ctx()->ctx_ex.pid = gras_os_getpid(); \ - __xbt_ex_ctx()->ctx_ex.file = (char*)__FILE__; \ - __xbt_ex_ctx()->ctx_ex.line = __LINE__; \ - __xbt_ex_ctx()->ctx_ex.func = (char*)_XBT_FUNCTION; \ - __xbt_ex_ctx()->ctx_ex.used = backtrace((void**)__xbt_ex_ctx()->ctx_ex.bt,XBT_BACKTRACE_SIZE);\ - __xbt_ex_ctx()->ctx_ex.bt_strings = NULL; \ - DO_THROW(__xbt_ex_ctx()->ctx_ex);\ + do { /* change this sequence into one block */ \ + ex_ctx_t *_throw_ctx = __xbt_ex_ctx(); \ + /* build the exception */ \ + _throw_ctx->ctx_ex.msg = (m); \ + _throw_ctx->ctx_ex.category = (xbt_errcat_t)(c); \ + _throw_ctx->ctx_ex.value = (v); \ + _throw_ctx->ctx_ex.remote = 0; \ + _throw_ctx->ctx_ex.host = (char*)NULL; \ + _throw_ctx->ctx_ex.procname = (char*)xbt_procname(); \ + _throw_ctx->ctx_ex.pid = (*xbt_getpid)(); \ + _throw_ctx->ctx_ex.file = (char*)__FILE__; \ + _throw_ctx->ctx_ex.line = __LINE__; \ + _throw_ctx->ctx_ex.func = (char*)_XBT_FUNCTION; \ + _throw_ctx->ctx_ex.bt_strings = NULL; \ + xbt_backtrace_current( (xbt_ex_t *) &(_throw_ctx->ctx_ex) ); \ + DO_THROW(_throw_ctx->ctx_ex); \ } while (0) +// __xbt_ex_ctx()->ctx_ex.used = backtrace((void**)__xbt_ex_ctx()->ctx_ex.bt,XBT_BACKTRACE_SIZE); /** @brief Builds and throws an exception with a string taking no arguments @hideinitializer */ @@ -507,8 +502,12 @@ extern void __xbt_ex_terminate_default(xbt_ex_t *e); /** @brief Exception destructor */ XBT_PUBLIC(void) xbt_ex_free(xbt_ex_t e); -XBT_PUBLIC(void) xbt_ex_display(xbt_ex_t *e); -XBT_PUBLIC(void) xbt_backtrace_display(void); +/** @brief Shows a backtrace of the current location */ +XBT_PUBLIC(void) xbt_backtrace_display_current(void); +/** @brief Captures a backtrace for further use */ +XBT_PUBLIC(void) xbt_backtrace_current(xbt_ex_t *e); +/** @brief Display a previously captured backtrace */ +XBT_PUBLIC(void) xbt_backtrace_display(xbt_ex_t *e); /** @} */ #endif /* __XBT_EX_H__ */