X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd88e15504912f111b8dcb568c2a8adbc111ed66..6de9090dd8692387ae343c587b26915f9922d7bd:/src/simix/smx_process_private.h diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h index a971ba3e5e..73fc7141cf 100644 --- a/src/simix/smx_process_private.h +++ b/src/simix/smx_process_private.h @@ -10,6 +10,11 @@ #include "simgrid/simix.h" #include "smx_smurf_private.h" +typedef struct s_smx_process_exit_fun { + int_f_pvoid_t fun; + void *arg; +} s_smx_process_exit_fun_t, *smx_process_exit_fun_t; + /** @brief Process datatype */ typedef struct s_smx_process { s_xbt_swag_hookup_t process_hookup; @@ -20,18 +25,19 @@ typedef struct s_smx_process { unsigned long pid; char *name; /**< @brief process name if any */ smx_host_t smx_host; /* the host on which the process is running */ - smx_context_t context; /* the context (either uctx or thread) that executes the user function */ + smx_context_t context; /* the context (uctx/raw/thread) that executes the user function */ xbt_running_ctx_t *running_ctx; - int doexception:1; - int blocked:1; - int suspended:1; + unsigned doexception:1; + unsigned blocked:1; + unsigned suspended:1; smx_host_t new_host; /* if not null, the host on which the process must migrate to */ smx_action_t waiting_action; /* the current blocking action if any */ xbt_fifo_t comms; /* the current non-blocking communication actions */ xbt_dict_t properties; s_smx_simcall_t simcall; void *data; /* kept for compatibility, it should be replaced with moddata */ - + xbt_dynar_t on_exit_fun; /* list of functions executed when the process dies */ + xbt_dynar_t on_exit_args; /* arguments (void*) of the functions executed when the process dies */ } s_smx_process_t; typedef struct s_smx_process_arg { @@ -50,6 +56,7 @@ void SIMIX_process_create(smx_process_t *process, xbt_main_func_t code, void *data, const char *hostname, + double kill_time, int argc, char **argv, xbt_dict_t properties); void SIMIX_process_runall(void); @@ -63,9 +70,9 @@ void SIMIX_process_yield(smx_process_t self); xbt_running_ctx_t *SIMIX_process_get_running_context(void); void SIMIX_process_exception_terminate(xbt_ex_t * e); void SIMIX_pre_process_change_host(smx_process_t process, - smx_host_t dest); + smx_host_t dest); void SIMIX_process_change_host(smx_process_t process, - smx_host_t dest); + smx_host_t dest); void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t host); void SIMIX_pre_process_suspend(smx_simcall_t simcall); smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer); @@ -85,4 +92,6 @@ void SIMIX_process_sleep_suspend(smx_action_t action); void SIMIX_process_sleep_resume(smx_action_t action); void SIMIX_process_sleep_destroy(smx_action_t action); +void SIMIX_process_on_exit(smx_process_t process); +void SIMIX_process_on_exit_add(int_f_pvoid_t fun, void *data); #endif