X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1ba88402bfb88a278d2e7c849441a9ed4a26120..e99350b90a8c0e400db2f43e3093b70afdbd2aac:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index f0d037e066..5fd7b60100 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -571,13 +571,14 @@ smx_rdv_t SIMIX_req_rdv_get_by_name(const char *name) /* FIXME: this is a horrible lost of performance, so we hack it out by * skipping the request (for now). It won't work on distributed but * probably we will change MSG for that. */ - return SIMIX_rdv_get_by_name(name); /* smx_req_t req = SIMIX_req_mine(); req->call = REQ_RDV_GEY_BY_NAME; req->rdv_get_by_name.name = name; SIMIX_request_push(); return req->rdv_get_by_name.result;*/ + + return SIMIX_rdv_get_by_name(name); } /** @@ -617,7 +618,8 @@ smx_action_t SIMIX_req_rdv_get_head(smx_rdv_t rdv) smx_action_t SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *), void *data) + int (*match_fun)(void *, void *), void *data, + int detached) { smx_req_t req = SIMIX_req_mine(); @@ -631,6 +633,7 @@ smx_action_t SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size, double rate, req->comm_isend.src_buff_size = src_buff_size; req->comm_isend.match_fun = match_fun; req->comm_isend.data = data; + req->comm_isend.detached = detached; SIMIX_request_push(); return req->comm_isend.result; @@ -658,13 +661,17 @@ void SIMIX_req_comm_destroy(smx_action_t comm) { xbt_assert0(comm, "Invalid parameter"); - /* FIXME remove this request type (auto-destroy finished comms) */ + /* FIXME remove this request type: comms are auto-destroyed now, + * but what happens with unfinished comms? */ + + /* smx_req_t req = SIMIX_req_mine(); req->call = REQ_COMM_DESTROY; req->comm_destroy.comm = comm; SIMIX_request_push(); + */ } void SIMIX_req_comm_cancel(smx_action_t comm) @@ -791,50 +798,6 @@ void *SIMIX_req_comm_get_dst_data(smx_action_t comm) return req->comm_get_dst_data.result; } -void *SIMIX_req_comm_get_src_buff(smx_action_t comm) -{ - smx_req_t req = SIMIX_req_mine(); - - req->call = REQ_COMM_GET_SRC_BUFF; - req->comm_get_src_buff.comm = comm; - - SIMIX_request_push(); - return req->comm_get_src_buff.result; -} - -void *SIMIX_req_comm_get_dst_buff(smx_action_t comm) -{ - smx_req_t req = SIMIX_req_mine(); - - req->call = REQ_COMM_GET_DST_BUFF; - req->comm_get_dst_buff.comm = comm; - - SIMIX_request_push(); - return req->comm_get_dst_buff.result; -} - -size_t SIMIX_req_comm_get_src_buff_size(smx_action_t comm) -{ - smx_req_t req = SIMIX_req_mine(); - - req->call = REQ_COMM_GET_SRC_BUFF_SIZE; - req->comm_get_src_buff_size.comm = comm; - - SIMIX_request_push(); - return req->comm_get_src_buff_size.result; -} - -size_t SIMIX_req_comm_get_dst_buff_size(smx_action_t comm) -{ - smx_req_t req = SIMIX_req_mine(); - - req->call = REQ_COMM_GET_DST_BUFF_SIZE; - req->comm_get_dst_buff_size.comm = comm; - - SIMIX_request_push(); - return req->comm_get_dst_buff_size.result; -} - smx_process_t SIMIX_req_comm_get_src_proc(smx_action_t comm) { smx_req_t req = SIMIX_req_mine();