X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/31b7fa457f9267af8eda2eee06aae74dd78eb412..1d86c2a6dd868b8634423c5f1be55b992709fc75:/src/simix/smurf_private.h diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h index f7d17fc682..8df9b4cc36 100644 --- a/src/simix/smurf_private.h +++ b/src/simix/smurf_private.h @@ -60,10 +60,6 @@ SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_REMAINS),\ 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),\ @@ -119,7 +115,7 @@ SIMIX_REQ_LIST * \brief Represents a SIMIX request. */ typedef struct s_smx_req { - s_xbt_swag_hookup_t state_hookup; + s_xbt_swag_hookup_t reqtable_hookup; e_smx_req_t call; smx_process_t issuer; @@ -374,26 +370,6 @@ typedef struct s_smx_req { 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; @@ -504,6 +480,7 @@ typedef struct s_smx_req { 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_answer(smx_req_t);