X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/953c48cec7e103dad772776f59832034e41ce232..b3d9680ac65d8bdd8e267aed69fc32a5abab12d7:/src/simix/private.h diff --git a/src/simix/private.h b/src/simix/private.h index da4b964b5a..b130cf9337 100644 --- a/src/simix/private.h +++ b/src/simix/private.h @@ -9,7 +9,6 @@ #ifndef SIMIX_PRIVATE_H #define SIMIX_PRIVATE_H -#include #include "simix/simix.h" #include "surf/surf.h" #include "xbt/fifo.h" @@ -17,6 +16,7 @@ #include "xbt/dict.h" #include "xbt/config.h" #include "xbt/function_types.h" +#include "xbt/ex_interface.h" /******************************** Datatypes ***********************************/ @@ -54,9 +54,7 @@ extern SIMIX_Global_t simix_global; /******************************** Process *************************************/ -typedef struct s_smx_context *smx_context_t; - -/** @brief Process datatype +/** @brief Process datatype @ingroup m_datatypes_management_details @{ */ typedef struct s_smx_process { s_xbt_swag_hookup_t process_hookup; @@ -67,11 +65,14 @@ typedef struct s_smx_context *smx_context_t; 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 that executes the scheduler function */ + ex_ctx_t *exception; int blocked : 1; int suspended : 1; int iwannadie : 1; smx_mutex_t mutex; /* mutex on which the process is blocked */ smx_cond_t cond; /* cond on which the process is blocked */ + smx_sem_t sem; /* semaphore on which the process is blocked */ + smx_action_t waiting_action; xbt_dict_t properties; void *data; /* kept for compatibility, it should be replaced with moddata */ @@ -89,9 +90,11 @@ typedef struct s_smx_process_arg { xbt_dict_t properties; } s_smx_process_arg_t, *smx_process_arg_t; +void SIMIX_create_maestro_process(void); void SIMIX_process_empty_trash(void); -void __SIMIX_process_schedule(smx_process_t process); -void __SIMIX_process_yield(void); +void SIMIX_process_schedule(smx_process_t process); +ex_ctx_t *SIMIX_process_get_exception(void); +void SIMIX_process_exception_terminate(xbt_ex_t * e); /*************************** Mutex and Conditional ****************************/ @@ -114,13 +117,69 @@ typedef struct s_smx_cond { } s_smx_cond_t; +typedef struct s_smx_sem { + /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_sem */ + xbt_swag_t sleeping; /* list of sleeping process */ + int capacity; + xbt_fifo_t actions; /* list of actions */ + /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_sem */ + +} s_smx_sem_t; + +/******************************* Networking ***********************************/ + +/** @brief Rendez-vous point datatype */ +typedef struct s_smx_rvpoint { + char *name; + smx_mutex_t read; + smx_mutex_t write; + xbt_fifo_t comm_fifo; + void *data; +} s_smx_rvpoint_t; + +typedef struct s_smx_comm { + + + smx_comm_type_t type; /* Type of the communication (comm_send,comm_recv) */ + smx_rdv_t rdv; /* Rendez-vous where the comm is queued */ + smx_sem_t sem; /* Semaphore associated to the surf simulation */ + int refcount; /* Number of processes involved in the cond */ + + /* Surf action data */ + smx_process_t src_proc; + smx_process_t dst_proc; + smx_action_t src_timeout; + smx_action_t dst_timeout; + smx_action_t act; + double rate; + double task_size; + + /* Data to be transfered */ + void *src_buff; + void *dst_buff; + size_t src_buff_size; + size_t *dst_buff_size; + void *data; /* User data associated to communication */ +} s_smx_comm_t; + +void SIMIX_network_copy_data(smx_comm_t comm); +smx_comm_t SIMIX_communication_new(smx_comm_type_t type); +void SIMIX_communication_destroy(smx_comm_t comm); +static inline void SIMIX_communication_use(smx_comm_t comm); +static inline void SIMIX_communication_wait_for_completion(smx_comm_t comm, double timeout); +static inline void SIMIX_rdv_push(smx_rdv_t rdv, smx_comm_t comm); +static inline void SIMIX_rdv_remove(smx_rdv_t rdv, smx_comm_t comm); + /********************************* Action *************************************/ +typedef enum {ready, ongoing, done, failed} smx_action_state_t; + /** @brief Action datatype @ingroup m_datatypes_management_details */ typedef struct s_smx_action { char *name; /**< @brief action name if any */ xbt_fifo_t cond_list; /*< conditional variables that must be signaled when the action finish. */ + xbt_fifo_t sem_list; /*< semaphores that must be signaled when the action finish. */ void *data; /**< @brief user data */ int refcount; /**< @brief reference counter */ surf_action_t surf_action; /* SURF modeling of computation */ @@ -142,7 +201,6 @@ void __SIMIX_host_destroy(void *host); void __SIMIX_cond_wait(smx_cond_t cond); void __SIMIX_cond_display_actions(smx_cond_t cond); void __SIMIX_action_display_conditions(smx_action_t action); -void __SIMIX_create_maestro_process(void); /******************************** Context *************************************/ @@ -159,7 +217,6 @@ void SIMIX_context_mod_exit(void); /* each context type must contain this macro at its begining -- OOP in C :/ */ #define SMX_CTX_BASE_T \ s_xbt_swag_hookup_t hookup; \ - ex_ctx_t *exception; \ xbt_main_func_t code; \ int argc; \ char **argv; \ @@ -192,9 +249,6 @@ typedef struct s_smx_context { typedef smx_context_t (*smx_pfn_context_factory_create_context_t) (xbt_main_func_t, int, char**, void_f_pvoid_t, void*); -/* function used to create the context for the maestro process */ -typedef smx_context_t (*smx_pfn_context_factory_create_maestro_context_t) (void); - /* this function finalize the specified context factory */ typedef int (*smx_pfn_context_factory_finalize_t) (smx_context_factory_t*); @@ -216,7 +270,6 @@ typedef void (*smx_pfn_context_resume_t) (smx_context_t old_context, /* interface of the context factories */ typedef struct s_smx_context_factory { - smx_pfn_context_factory_create_maestro_context_t create_maestro_context; smx_pfn_context_factory_create_context_t create_context; smx_pfn_context_factory_finalize_t finalize; smx_pfn_context_free_t free; @@ -241,6 +294,9 @@ void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory, const c void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory); void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory); +void SIMIX_ctx_lua_factory_init(smx_context_factory_t * factory); +void SIMIX_ctx_lua_factory_loadfile(const char *file); + void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory); @@ -265,14 +321,6 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory); * iwannadie == 1, and call SIMIX_context_stop(same than first case afterward) */ -/** - * \brief creates the context for the maestro process - */ -static inline smx_context_t SIMIX_context_create_maestro() -{ - return (*(simix_global->context_factory->create_maestro_context)) (); -} - /** * \brief creates a new context for a user level process * \param code a main function