/* ex - Exception Handling */
-/* Copyright (c) 2005-2014. The SimGrid Team.
+/* Copyright (c) 2005-2015. The SimGrid Team.
* All rights reserved. */
/* Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com> */
* (that's where we get the process name for the logs and the exception storage)
* -- do not mess with it --
*/
-typedef struct {
+typedef struct xbt_running_ctx_t {
__ex_mctx_t *ctx_mctx; /* permanent machine context of enclosing try/catch */
int ctx_caught; /* temporary flag whether exception was caught */
volatile xbt_ex_t exception; /* temporary exception storage */
/* backtrace */ 0, NULL, /* bt[] */ } }
XBT_PUBLIC_DATA(const xbt_running_ctx_t) __xbt_ex_ctx_initializer;
-#define XBT_RUNNING_CTX_INITIALIZE(ctx) (*(ctx) = __xbt_ex_ctx_initializer)
+
+// #define XBT_RUNNING_CTX_INITIALIZE(ctx) (*(ctx) = __xbt_ex_ctx_initializer)
+
+#define XBT_RUNNING_CTX_INITIALIZE(ctx) \
+ (ctx)->ctx_mctx = NULL; \
+ (ctx)->ctx_caught = 0; \
+ (ctx)->exception.msg = NULL; \
+ (ctx)->exception.category = unknown_error; \
+ (ctx)->exception.value = 0; \
+ (ctx)->exception.procname = NULL; \
+ (ctx)->exception.pid = 0; \
+ (ctx)->exception.file = NULL; \
+ (ctx)->exception.line = 0; \
+ (ctx)->exception.used = 0; \
+ (ctx)->exception.bt_strings = NULL;
/* the exception context */
typedef xbt_running_ctx_t *(*xbt_running_ctx_fetcher_t) (void);
_throw_ctx->exception.bt_strings = NULL; \
xbt_backtrace_current((xbt_ex_t *)&(_throw_ctx->exception));
-#define _THROW(c, v, m) \
+#define _XBT_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); \
/** @brief Builds and throws an exception
@hideinitializer */
-#define THROW(c, v) _THROW(c, v, NULL)
+#define THROW(c, v) _XBT_THROW(c, v, NULL)
/** @brief Builds and throws an exception with a printf-like formatted message
@hideinitializer */
-#define THROWF(c, v, ...) _THROW(c, v, bprintf(__VA_ARGS__))
+#define THROWF(c, v, ...) _XBT_THROW(c, v, bprintf(__VA_ARGS__))
#define THROW_IMPOSSIBLE \
THROWF(unknown_error, 0, "The Impossible Did Happen (yet again)")