X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2bf63103e5914cb2245c77d45adc47e9a302889..504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779:/src/simix/private.h diff --git a/src/simix/private.h b/src/simix/private.h index 293b0a0700..0b119fb842 100644 --- a/src/simix/private.h +++ b/src/simix/private.h @@ -9,6 +9,7 @@ #ifndef SIMIX_PRIVATE_H #define SIMIX_PRIVATE_H +#include #include "simix/simix.h" #include "surf/surf.h" #include "xbt/fifo.h" @@ -16,16 +17,17 @@ #include "xbt/dict.h" #include "xbt/context.h" #include "xbt/config.h" +#include "xbt/function_types.h" /******************************* Datatypes **********************************/ /********************************** Host ************************************/ -typedef struct s_simdata_host { +typedef struct s_smx_simdata_host { void *host; /* SURF modeling */ xbt_swag_t process_list; -} s_simdata_host_t; +} s_smx_simdata_host_t; /********************************* Simix Global ******************************/ @@ -33,114 +35,96 @@ typedef struct SIMIX_Global { xbt_fifo_t host; xbt_swag_t process_to_run; xbt_swag_t process_list; - /* xbt_swag_t process_sleeping; */ smx_process_t current_process; xbt_dict_t registered_functions; -/* FILE *paje_output; - int session; */ + smx_creation_func_t create_process_function; + void_f_pvoid_t kill_process_function; + void_f_pvoid_t cleanup_process_function; } s_SIMIX_Global_t, *SIMIX_Global_t; extern SIMIX_Global_t simix_global; /******************************* Process *************************************/ -typedef struct s_simdata_process { - smx_host_t host; /* the host on which the process is running */ - xbt_context_t context; /* the context that executes the scheduler fonction */ +typedef struct s_smx_simdata_process { + smx_host_t smx_host; /* the host on which the process is running */ + xbt_context_t context; /* the context that executes the scheduler fonction */ int blocked; int suspended; smx_mutex_t mutex; /* mutex on which the process is blocked */ smx_cond_t cond; /* cond on which the process is blocked */ - smx_host_t put_host; /* used for debugging purposes */ - smx_action_t block_action; /* action that block the process when it does a mutex_lock or cond_wait */ - int argc; /* arguments number if any */ - char **argv; /* arguments table if any */ -// SIMIX_error_t last_errno; /* the last value returned by a MSG_function */ -// int paje_state; /* the number of states stacked with Paje */ -} s_simdata_process_t; - -typedef struct process_arg { + int argc; /* arguments number if any */ + char **argv; /* arguments table if any */ + xbt_dict_t properties; +} s_smx_simdata_process_t; + +typedef struct s_smx_process_arg { const char *name; - smx_process_code_t code; + xbt_main_func_t code; void *data; - smx_host_t host; + char *hostname; int argc; char **argv; double kill_time; -} s_process_arg_t, *process_arg_t; + xbt_dict_t properties; +} s_smx_process_arg_t, *smx_process_arg_t; /********************************* Mutex and Conditional ****************************/ typedef struct s_smx_mutex { - xbt_swag_t sleeping; /* list of sleeping process */ - int using; + + /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_mutex */ + xbt_swag_t sleeping; /* list of sleeping process */ + int using; + /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_mutex */ } s_smx_mutex_t; typedef struct s_smx_cond { - xbt_swag_t sleeping; /* list of sleeping process */ - smx_mutex_t mutex; - xbt_fifo_t actions; /* list of actions */ + + /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_cond */ + xbt_swag_t sleeping; /* list of sleeping process */ + smx_mutex_t mutex; + xbt_fifo_t actions; /* list of actions */ + /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_cond */ } s_smx_cond_t; /********************************* Action **************************************/ -typedef struct s_simdata_action { +typedef struct s_smx_simdata_action { surf_action_t surf_action; /* SURF modeling of computation */ - - xbt_fifo_t cond_list; /* conditional variables that must be signaled when the action finish. */ - smx_host_t source; -/* control needed when the action blocks a process(__SIMIX_process_block). For each process that is blocked a new action is created, the process is stocked in cond_process variable and the "boolean" action_block is marked to 1 */ - int action_block; /* simix control variable, system action or not */ - smx_process_t cond_process; /* system process will wake up */ - smx_cond_t timeout_cond; /* useful to remove the process from the sleeping list when a timeout occurs */ + smx_host_t source; -} s_simdata_action_t; +} s_smx_simdata_action_t; /******************************* Configuration support **********************************/ -void simix_config_init(void); /* create the config set, call this before use! */ -void simix_config_finalize(void); /* destroy the config set, call this at cleanup. */ -extern int _simix_init_status; /* 0: beginning of time; - 1: pre-inited (cfg_set created); - 2: inited (running) */ +void simix_config_init(void); /* create the config set, call this before use! */ +void simix_config_finalize(void); /* destroy the config set, call this at cleanup. */ +extern int _simix_init_status; /* 0: beginning of time; + 1: pre-inited (cfg_set created); + 2: inited (running) */ extern xbt_cfg_t _simix_cfg_set; - - - - -//#define PROCESS_SET_ERRNO(val) (SIMIX_process_self()->simdata->last_errno=val) -//#define PROCESS_GET_ERRNO() (SIMIX_process_self()->simdata->last_errno) -//#define SIMIX_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0) -/* #define CHECK_ERRNO() ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */ - -#define CHECK_HOST() xbt_assert0(surf_workstation_resource->extension_public-> \ +#define SIMIX_CHECK_HOST() xbt_assert0(surf_workstation_model->extension_public-> \ get_state(SIMIX_host_self()->simdata->host)==SURF_CPU_ON,\ "Host failed, you cannot call this function.") -smx_host_t __SIMIX_host_create(const char *name, void *workstation, void *data); +smx_host_t __SIMIX_host_create(const char *name, void *workstation, + void *data); void __SIMIX_host_destroy(smx_host_t host); -int __SIMIX_process_block(double max_duration); -void __SIMIX_process_unblock(smx_process_t process); -int __SIMIX_process_isBlocked(smx_process_t process); - -void __SIMIX_display_process_status(void); - -void __SIMIX_wait_for_action(smx_process_t process, smx_action_t action); - +void __SIMIX_cond_wait(smx_cond_t cond); -/* -void __MSG_task_execute(smx_process_t process, m_task_t task); -MSG_error_t __MSG_task_wait_event(smx_process_t process, m_task_t task); -*/ +void __SIMIX_cond_display_actions(smx_cond_t cond); +void __SIMIX_action_display_conditions(smx_action_t action); +xbt_dict_t current_property_set; #endif