X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6be900fe3f149eede7dd54719b172757556a4e81..fc3419efe4d92bfa202543376995977c6a3171e9:/include/xbt/ex.h

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 97e4eeacac..2d17bffe1c 100644
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -65,7 +65,7 @@ SG_BEGIN_DECL()
 #  define MAYDAY_CATCH(e)   printf("%d %s:%d Catched '%s'\n",           \
                                    xbt_getpid(), __FILE__, __LINE__,    \
                                    (e).msg                              \
-				  ),
+          ),
 #else
 #  define MAYDAY_SAVE(m)
 #  define MAYDAY_RESTORE(m)
@@ -313,12 +313,12 @@ XBT_PUBLIC_DATA(const xbt_running_ctx_t) __xbt_ex_ctx_initializer;
 /* the exception context */
 typedef xbt_running_ctx_t *(*xbt_running_ctx_fetcher_t) (void);
 XBT_PUBLIC_DATA(xbt_running_ctx_fetcher_t) __xbt_running_ctx_fetch;
-extern xbt_running_ctx_t *__xbt_ex_ctx_default(void);
+XBT_PUBLIC( xbt_running_ctx_t *)__xbt_ex_ctx_default(void);
 
 /* the termination handler */
 typedef void (*ex_term_cb_t) (xbt_ex_t *);
 XBT_PUBLIC_DATA(ex_term_cb_t) __xbt_ex_terminate;
-extern void __xbt_ex_terminate_default(xbt_ex_t * e);
+XBT_PUBLIC( void )__xbt_ex_terminate_default(xbt_ex_t * e);
 
 /** @brief Introduce a block where exception may be dealed with 
  *  @hideinitializer
@@ -391,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
@@ -417,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
@@ -458,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
@@ -517,5 +516,5 @@ XBT_PUBLIC(void) xbt_backtrace_display(xbt_ex_t * e);
 
 SG_END_DECL()
 
-/** @} */
+/** @} */
 #endif                          /* __XBT_EX_H__ */