X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66b0686fe441796325c3b5738b1b880d15ce1ea6..18c57b27dd71ee7839c6a90368c845886a87d638:/include/xbt/ex.h diff --git a/include/xbt/ex.h b/include/xbt/ex.h index 50ef63e9fe..f23bd37e1d 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -55,15 +55,15 @@ SG_BEGIN_DECL() # include #include # define MAYDAY_SAVE(m) printf("%d %s:%d save %p\n", \ - (*xbt_getpid)(),__FILE__,__LINE__, \ + xbt_getpid(), __FILE__, __LINE__, \ (m)->jb \ ), # define MAYDAY_RESTORE(m) printf("%d %s:%d restore %p\n", \ - (*xbt_getpid)(),__FILE__,__LINE__, \ + xbt_getpid(), __FILE__, __LINE__, \ (m)->jb \ ), # define MAYDAY_CATCH(e) printf("%d %s:%d Catched '%s'\n", \ - (*xbt_getpid)(),__FILE__,__LINE__, \ + xbt_getpid(), __FILE__, __LINE__, \ (e).msg \ ), #else @@ -262,7 +262,8 @@ typedef enum { cancel_error, /**< an action was canceled */ thread_error, /**< error while [un]locking */ host_error, /**< host failed */ - tracing_error /**< error during the simulation tracing */ + tracing_error, /**< error during the simulation tracing */ + io_error /**< disk or file error */ } xbt_errcat_t; XBT_PUBLIC(const char *) xbt_ex_catname(xbt_errcat_t cat); @@ -450,7 +451,7 @@ extern void __xbt_ex_terminate_default(xbt_ex_t * e); _throw_ctx->exception.remote = 0; \ _throw_ctx->exception.host = (char*)NULL; \ _throw_ctx->exception.procname = (char*)xbt_procname(); \ - _throw_ctx->exception.pid = (*xbt_getpid)(); \ + _throw_ctx->exception.pid = xbt_getpid(); \ _throw_ctx->exception.file = (char*)__FILE__; \ _throw_ctx->exception.line = __LINE__; \ _throw_ctx->exception.func = (char*)_XBT_FUNCTION; \