SIMIX_REQ_ENUM_ELEMENT(REQ_HOST_EXECUTION_WAIT),\
SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_CREATE),\
SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_KILL),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_KILLALL),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_CLEANUP),\
SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_CHANGE_HOST),\
SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_SUSPEND),\
SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_RESUME),\
SIMIX_REQ_ENUM_ELEMENT(REQ_RDV_GEY_BY_NAME),\
SIMIX_REQ_ENUM_ELEMENT(REQ_RDV_COMM_COUNT_BY_HOST),\
SIMIX_REQ_ENUM_ELEMENT(REQ_RDV_GET_HEAD),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_SEND),\
SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_ISEND),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_RECV),\
SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_IRECV),\
SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_DESTROY),\
SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_CANCEL),\
SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_STATE),\
SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_SRC_DATA),\
SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_DST_DATA),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_SRC_BUFF),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_DST_BUFF),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_SRC_BUFF_SIZE),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_DST_BUFF_SIZE),\
SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_SRC_PROC),\
SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_DST_PROC),\
SIMIX_REQ_ENUM_ELEMENT(REQ_MUTEX_INIT),\
SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_WOULD_BLOCK),\
SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_ACQUIRE),\
SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_ACQUIRE_TIMEOUT),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_GET_CAPACITY)
+SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_GET_CAPACITY),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_FILE_READ)
/* REQ_COMM_IS_LATENCY_BOUNDED and REQ_SET_CATEGORY make things complicated
* because they are not always present */
* \brief Represents a SIMIX request.
*/
typedef struct s_smx_req {
- s_xbt_swag_hookup_t reqtable_hookup;
e_smx_req_t call;
smx_process_t issuer;
struct {
smx_process_t process;
- const char *source;
- const char *dest;
+ } process_cleanup;
+
+ struct {
+ smx_process_t process;
+ smx_host_t dest;
} process_change_host;
struct {
size_t src_buff_size;
int (*match_fun)(void *, void *);
void *data;
+ double timeout;
+ } comm_send;
+
+ struct {
+ smx_rdv_t rdv;
+ double task_size;
+ double rate;
+ void *src_buff;
+ size_t src_buff_size;
+ int (*match_fun)(void *, void *);
+ void (*clean_fun)(void *);
+ void *data;
int detached;
smx_action_t result;
} comm_isend;
void *dst_buff;
size_t *dst_buff_size;
int (*match_fun)(void *, void *);
- void *data;
+ void *data;
+ double timeout;
+ } comm_recv;
+
+ struct {
+ smx_rdv_t rdv;
+ void *dst_buff;
+ size_t *dst_buff_size;
+ int (*match_fun)(void *, void *);
+ void *data;
smx_action_t result;
} comm_irecv;
void *result;
} comm_get_dst_data;
- struct {
- smx_action_t comm;
- void *result;
- } comm_get_src_buff;
-
- struct {
- smx_action_t comm;
- void *result;
- } comm_get_dst_buff;
-
- struct {
- smx_action_t comm;
- size_t result;
- } comm_get_src_buff_size;
-
- struct {
- smx_action_t comm;
- size_t result;
- } comm_get_dst_buff_size;
-
struct {
smx_action_t comm;
smx_process_t result;
smx_sem_t sem;
int result;
} sem_get_capacity;
+
+ struct {
+ char* name;;
+ } file_read;
};
} s_smx_req_t, *smx_req_t;
/******************************** General *************************************/
-void SIMIX_request_init(void);
-void SIMIX_request_destroy(void);
-xbt_swag_t SIMIX_request_get_reqlist(int thread_pid);
-void SIMIX_request_push(void);
-smx_req_t SIMIX_request_pop(void);
+void SIMIX_request_push(smx_process_t self);
void SIMIX_request_answer(smx_req_t);
void SIMIX_request_pre(smx_req_t, int);
void SIMIX_request_post(smx_action_t);