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
Deactivate this assert again.
[simgrid.git]
/
include
/
xbt
/
ex.h
diff --git
a/include/xbt/ex.h
b/include/xbt/ex.h
index
77b1967
..
ef5b916
100644
(file)
--- a/
include/xbt/ex.h
+++ b/
include/xbt/ex.h
@@
-306,33
+306,9
@@
typedef struct {
{ NULL, 0, { /* content */ NULL, unknown_error, 0, \
/* throw point*/ 0,NULL, NULL,0, NULL, 0, NULL,\
/* backtrace */ 0, NULL, /* bt[] */ } }
-#define XBT_RUNNING_CTX_INITIALIZE(ctx) \
- do { \
- (ctx)->ctx_mctx = NULL; \
- (ctx)->ctx_caught = 0; \
- (ctx)->exception.msg = NULL; \
- (ctx)->exception.category = 0; \
- (ctx)->exception.value = 0; \
- (ctx)->exception.remote = 0; \
- (ctx)->exception.host = NULL; \
- (ctx)->exception.procname = NULL; \
- (ctx)->exception.pid = 0; \
- (ctx)->exception.file = NULL; \
- (ctx)->exception.line = 0; \
- (ctx)->exception.func = NULL; \
- (ctx)->exception.bt[0] = NULL; \
- (ctx)->exception.bt[1] = NULL; \
- (ctx)->exception.bt[2] = NULL; \
- (ctx)->exception.bt[3] = NULL; \
- (ctx)->exception.bt[4] = NULL; \
- (ctx)->exception.bt[5] = NULL; \
- (ctx)->exception.bt[6] = NULL; \
- (ctx)->exception.bt[7] = NULL; \
- (ctx)->exception.bt[8] = NULL; \
- (ctx)->exception.bt[9] = NULL; \
- (ctx)->exception.used = 0; \
- (ctx)->exception.bt_strings = NULL; \
- } while (0)
+
+XBT_PUBLIC_DATA(const xbt_running_ctx_t) __xbt_ex_ctx_initializer;
+#define XBT_RUNNING_CTX_INITIALIZE(ctx) (*(ctx) = __xbt_ex_ctx_initializer)
/* the exception context */
typedef xbt_running_ctx_t *(*xbt_running_ctx_fetcher_t) (void);
@@
-415,17
+391,21
@@
extern void __xbt_ex_terminate_default(xbt_ex_t * e);
} \
else
-#define DO_THROW(running_ctx) \
- /* deal with the exception */ \
- if (running_ctx->ctx_mctx == NULL) \
- __xbt_ex_terminate((xbt_ex_t*)&(running_ctx->exception)); /* not catched */ \
- else \
- __ex_mctx_restore(running_ctx->ctx_mctx); /* catched somewhere */ \
- abort() /* nope, stupid GCC, we won't survive a THROW (this won't be reached) */
+#define DO_THROW(running_ctx) \
+ do { /* deal with the exception */ \
+ xbt_running_ctx_t *ctx = (running_ctx); \
+ if (ctx->ctx_mctx == NULL) \
+ __xbt_ex_terminate((xbt_ex_t*)&(ctx->exception)); /* not catched */ \
+ else \
+ __ex_mctx_restore(ctx->ctx_mctx); /* catched somewhere */ \
+ abort(); /* nope, stupid GCC, we won't survive a THROW */ \
+ /* (this won't be reached) */ \
+ } while(0)
/** @brief Helper macro for THROW and THROWF
* @hideinitializer
*
+ * @param _throw_ctx: the throwing context in which we should construct the exception
* @param c: category code (integer)
* @param v: value (integer)
* @param m: message text
@@
-441,23
+421,26
@@
extern void __xbt_ex_terminate_default(xbt_ex_t * e);
* CLEANUP and CATCH blocks.
*/
-#define _THROW(c,v,m) \
- do { /* change this sequence into one block */ \
- xbt_running_ctx_t *_throw_ctx = __xbt_running_ctx_fetch(); \
- /* build the exception */ \
- _throw_ctx->exception.msg = (m); \
- _throw_ctx->exception.category = (xbt_errcat_t)(c); \
- _throw_ctx->exception.value = (v); \
- _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.file = (char*)__FILE__; \
- _throw_ctx->exception.line = __LINE__; \
- _throw_ctx->exception.func = (char*)_XBT_FUNCTION; \
- _throw_ctx->exception.bt_strings = NULL; \
- xbt_backtrace_current( (xbt_ex_t *) &(_throw_ctx->exception) ); \
- DO_THROW(_throw_ctx); \
+#define THROW_PREPARE(_throw_ctx, c, v, m) \
+ /* build the exception */ \
+ _throw_ctx->exception.msg = (m); \
+ _throw_ctx->exception.category = (xbt_errcat_t)(c); \
+ _throw_ctx->exception.value = (v); \
+ _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.file = (char*)__FILE__; \
+ _throw_ctx->exception.line = __LINE__; \
+ _throw_ctx->exception.func = (char*)_XBT_FUNCTION; \
+ _throw_ctx->exception.bt_strings = NULL; \
+ xbt_backtrace_current((xbt_ex_t *)&(_throw_ctx->exception));
+
+#define _THROW(c, v, m) \
+ do { /* change this sequence into one block */ \
+ xbt_running_ctx_t *_throw_ctx = __xbt_running_ctx_fetch(); \
+ THROW_PREPARE(_throw_ctx, c, v, m); \
+ DO_THROW(_throw_ctx); \
} while (0)
/** @brief Builds and throws an exception
@@
-482,15
+465,7
@@
extern void __xbt_ex_terminate_default(xbt_ex_t * e);
/** @brief re-throwing of an already caught exception (ie, pass it to the upper catch block)
* @hideinitializer
*/
-#define RETHROW \
- do { \
- xbt_running_ctx_t *ctx = __xbt_running_ctx_fetch(); \
- if (ctx->ctx_mctx == NULL) \
- __xbt_ex_terminate((xbt_ex_t*)&(ctx->exception)); \
- else \
- __ex_mctx_restore(ctx->ctx_mctx); \
- abort();\
- } while(0)
+#define RETHROW DO_THROW(__xbt_running_ctx_fetch())
/** @brief like THROWF, but adding some details to the message of an existing exception
* @hideinitializer