X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/342300c298d95f44a80e4d670e43210777f15744..9ad959d48fa6a513def7651fbcc70f50ad0f0c04:/src/simix/private.h diff --git a/src/simix/private.h b/src/simix/private.h index ac1f6234d7..195a77db88 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" @@ -149,21 +148,22 @@ typedef struct s_smx_comm { /* 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; - size_t src_buff_size; 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); @@ -293,6 +293,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);