X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/94974c282c6e6d096238716853bb053330170d76..ae8140f19db6cb86f753e32499eab49190846d1f:/src/simix/smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index e15730f78c..13dca2f9a2 100644
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -46,6 +46,17 @@ typedef struct s_smx_global {
 extern smx_global_t simix_global;
 extern unsigned long simix_process_maxpid;
 
+/******************************** Exceptions *********************************/
+
+#define SMX_EXCEPTION(issuer, c, v, m)                                  \
+  if (1) {                                                              \
+    smx_process_t _smx_throw_issuer = (issuer);                         \
+    THROW_PREPARE(_smx_throw_issuer->running_ctx, (c), (v), xbt_strdup(m)); \
+    _smx_throw_issuer->doexception = 1;                                 \
+  } else ((void)0)
+
+#define SMX_THROW() RETHROW
+
 /*********************************** Time ************************************/
 
 /** @brief Timer datatype */
@@ -79,7 +90,7 @@ typedef struct s_smx_action {
   e_smx_action_type_t type;          /* Type of SIMIX action*/
   e_smx_state_t state;               /* State of the action */
   char *name;                        /* Action name if any */
-  xbt_fifo_t request_list;           /* List of requests on this action */
+  xbt_fifo_t simcalls;               /* List of simcalls waiting for this action */
 
   /* Data specific to each action type */
   union {
@@ -161,8 +172,8 @@ static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t sta
 void SIMIX_context_mod_init(void);
 void SIMIX_context_mod_exit(void);
 
-XBT_INLINE void SIMIX_context_set_current(smx_context_t context);
-XBT_INLINE smx_context_t SIMIX_context_get_current(void);
+void SIMIX_context_set_current(smx_context_t context);
+smx_context_t SIMIX_context_get_current(void);
 
 /* All factories init */
 void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory);
@@ -242,7 +253,7 @@ static XBT_INLINE void SIMIX_context_suspend(smx_context_t context)
 /**
  \brief Executes all the processes to run (in parallel if possible).
  */
-static XBT_INLINE void SIMIX_context_runall()
+static XBT_INLINE void SIMIX_context_runall(void)
 {
   simix_global->context_factory->runall();
 }