X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1575a289945556e5772812e30f9cf2ab2d879b19..1c6ecd7825422241dd932318a4ba03c3df1de985:/src/simix/private.h diff --git a/src/simix/private.h b/src/simix/private.h index 7b2d98c3c3..4032673aa3 100644 --- a/src/simix/private.h +++ b/src/simix/private.h @@ -94,6 +94,8 @@ typedef struct s_smx_action { int refcount; /* Number of processes involved in the cond */ int detached; /* If detached or not */ + void (*clean_fun)(void*); /* Function to clean the detached src_buf if something goes wrong */ + /* Surf action data */ surf_action_t surf_comm; /* The Surf communication action encapsulated */ surf_action_t src_timeout; /* Surf's actions to instrument the timeouts */ @@ -197,8 +199,10 @@ static XBT_INLINE smx_context_t SIMIX_context_new(xbt_main_func_t code, smx_process_t simix_process) { - return (*(simix_global->context_factory->create_context)) - (code, argc, argv, cleanup_func, simix_process); + return simix_global->context_factory->create_context(code, + argc, argv, + cleanup_func, + simix_process); } /** @@ -208,7 +212,7 @@ static XBT_INLINE smx_context_t SIMIX_context_new(xbt_main_func_t code, */ static XBT_INLINE void SIMIX_context_free(smx_context_t context) { - (*(simix_global->context_factory->free)) (context); + simix_global->context_factory->free(context); } /** @@ -217,7 +221,7 @@ static XBT_INLINE void SIMIX_context_free(smx_context_t context) */ static XBT_INLINE void SIMIX_context_stop(smx_context_t context) { - (*(simix_global->context_factory->stop)) (context); + simix_global->context_factory->stop(context); } /** @@ -227,16 +231,15 @@ static XBT_INLINE void SIMIX_context_stop(smx_context_t context) */ static XBT_INLINE void SIMIX_context_suspend(smx_context_t context) { - (*(simix_global->context_factory->suspend)) (context); + simix_global->context_factory->suspend(context); } /** - \brief executes all the processes (in parallel if possible) - \param processes the dynar of processes to execute + \brief Executes all the processes to run (in parallel if possible). */ -static XBT_INLINE void SIMIX_context_runall(xbt_dynar_t processes) +static XBT_INLINE void SIMIX_context_runall() { - (*(simix_global->context_factory->runall)) (processes); + simix_global->context_factory->runall(); } /** @@ -245,7 +248,7 @@ static XBT_INLINE void SIMIX_context_runall(xbt_dynar_t processes) static XBT_INLINE smx_context_t SIMIX_context_self(void) { if (simix_global && simix_global->context_factory != NULL) { - return (*(simix_global->context_factory->self))(); + return simix_global->context_factory->self(); } return NULL; @@ -258,7 +261,7 @@ static XBT_INLINE smx_context_t SIMIX_context_self(void) */ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context) { - return (*(simix_global->context_factory->get_data))(context); + return simix_global->context_factory->get_data(context); } XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);