A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Starting simix mecanism for io.
[simgrid.git]
/
include
/
xbt
/
ex.h
diff --git
a/include/xbt/ex.h
b/include/xbt/ex.h
index
50ef63e
..
f23bd37
100644
(file)
--- a/
include/xbt/ex.h
+++ b/
include/xbt/ex.h
@@
-55,15
+55,15
@@
SG_BEGIN_DECL()
# include <stdio.h>
#include <errno.h>
# define MAYDAY_SAVE(m) printf("%d %s:%d save %p\n", \
# include <stdio.h>
#include <errno.h>
# 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", \
(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", \
(m)->jb \
),
# define MAYDAY_CATCH(e) printf("%d %s:%d Catched '%s'\n", \
-
(*xbt_getpid)(),__FILE__,__LINE__,
\
+
xbt_getpid(), __FILE__, __LINE__,
\
(e).msg \
),
#else
(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 */
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);
} 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.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; \
_throw_ctx->exception.file = (char*)__FILE__; \
_throw_ctx->exception.line = __LINE__; \
_throw_ctx->exception.func = (char*)_XBT_FUNCTION; \